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:
WithoutPants 2019-11-25 13:10:16 +11:00 committed by Leopere
parent 46654f1672
commit 2a02e5a65d
4 changed files with 18 additions and 5 deletions

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
go.mod text eol=lf
go.sum text eol=lf

View File

@ -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}"

View File

@ -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

View File

@ -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,