mirror of https://github.com/stashapp/stash.git
Add test and integration tests to the Makefile (#222)
* Add unit and integration test to make file * Add gitattributes for go.mod/go.sum files * Always run integration tests * Removed redundant call. Clarified targets
This commit is contained in:
parent
46654f1672
commit
2a02e5a65d
|
@ -0,0 +1,2 @@
|
|||
go.mod text eol=lf
|
||||
go.sum text eol=lf
|
|
@ -16,7 +16,7 @@ before_install:
|
|||
script:
|
||||
#- make lint
|
||||
#- make vet
|
||||
- go test -mod=vendor
|
||||
- make it
|
||||
before_deploy:
|
||||
- if [ "$TRAVIS_BRANCH" = "develop" ]; then export TAG_SUFFIX="_dev"; fi
|
||||
- export STASH_VERSION="v0.0.0-alpha${TAG_SUFFIX}"
|
||||
|
|
10
Makefile
10
Makefile
|
@ -34,6 +34,16 @@ vet:
|
|||
lint:
|
||||
revive -config revive.toml -exclude ./vendor/... ./...
|
||||
|
||||
# runs unit tests - excluding integration tests
|
||||
.PHONY: test
|
||||
test:
|
||||
go test -mod=vendor ./...
|
||||
|
||||
# runs all tests - including integration tests
|
||||
.PHONY: it
|
||||
it:
|
||||
go test -mod=vendor -tags=integration ./...
|
||||
|
||||
.PHONY: ui
|
||||
ui:
|
||||
cd ui/v2 && yarn build
|
||||
|
|
|
@ -3,13 +3,14 @@ package manager
|
|||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"github.com/stashapp/stash/pkg/ffmpeg"
|
||||
"github.com/stashapp/stash/pkg/logger"
|
||||
"github.com/stashapp/stash/pkg/utils"
|
||||
"math"
|
||||
"os/exec"
|
||||
"runtime"
|
||||
"strconv"
|
||||
|
||||
"github.com/stashapp/stash/pkg/ffmpeg"
|
||||
"github.com/stashapp/stash/pkg/logger"
|
||||
"github.com/stashapp/stash/pkg/utils"
|
||||
)
|
||||
|
||||
type GeneratorInfo struct {
|
||||
|
@ -84,7 +85,7 @@ func (g *GeneratorInfo) configure() error {
|
|||
// Something seriously wrong with this file
|
||||
if numberOfFrames == 0 || !utils.IsValidFloat64(framerate) {
|
||||
logger.Errorf(
|
||||
"number of frames or framerate is 0. nb_frames <%s> framerate <%s> duration <%s>",
|
||||
"number of frames or framerate is 0. nb_frames <%s> framerate <%f> duration <%f>",
|
||||
videoStream.NbFrames,
|
||||
framerate,
|
||||
g.VideoFile.Duration,
|
||||
|
|
Loading…
Reference in New Issue