diff --git a/Makefile b/Makefile index 5cde344..7a4815b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -include .env .EXPORT_ALL_VARIABLES: -.PHONY: all test lint vet fmt travis coverage checkfmt prepare deps build +.PHONY: all test lint fmt coverage checkfmt prepare deps build NO_COLOR=\033[0m OK_COLOR=\033[32;01m @@ -9,20 +9,19 @@ ERROR_COLOR=\033[31;01m WARN_COLOR=\033[33;01m -all: test vet checkfmt - -travis: test checkfmt coverage +all: test checkfmt prepare: fmt test test: @echo "$(OK_COLOR)Test packages$(NO_COLOR)" - @go test -v ./... + @go test -race -v ./... coverage: @echo "$(OK_COLOR)Make coverage report$(NO_COLOR)" @./script/coverage.sh - -goveralls -coverprofile=gover.coverprofile -service=travis-ci + +#failed to decode ammo with err: unexpected EOF, at position: 1047; data: "GET /?sleep=50 HTTP/1.0\nHost: wallarm." checkfmt: @echo "$(OK_COLOR)Check formats$(NO_COLOR)" @@ -48,7 +47,7 @@ deps: #==================== DOCKER ==================== IMAGE_NAME ?= denisqsound/specter -PLATFORMS := linux/arm64 linux/amd64# darwin/amd64 darwin/arm64 +PLATFORMS := linux/arm64 linux/amd64#darwin/amd64 darwin/arm64 IMAGE_FILE := pipeline#specter# define BUILD_template diff --git a/cli/cli.go b/cli/cli.go index 2e84c8c..2315fb7 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -34,7 +34,7 @@ const defaultConfigFile = "load" const stdinConfigSelector = "-" const mainBucket = "wallarm-perf-pandora" -var configSearchDirs = []string{"./", "./config", "/etc/specter", "./../suite/mirroring"} +var configSearchDirs = []string{"./", "./config", "/etc/specter", "./../suite/mirroring", "./bin"} type cliConfig struct { Engine engine.Config `config:",squash"` diff --git a/components/providers/http/decoders/raw_test.go b/components/providers/http/decoders/raw_test.go index b827919..932684e 100644 --- a/components/providers/http/decoders/raw_test.go +++ b/components/providers/http/decoders/raw_test.go @@ -12,7 +12,7 @@ import ( "github.com/wallarm/specter/components/providers/http/config" ) -const rawDecoderInput = `38 good50 +const rawDecoderInput = `44 good50 GET /?sleep=50 HTTP/1.0 Host: wallarm.com diff --git a/script/coverage.sh b/script/coverage.sh index a40d4ae..65e9fb2 100755 --- a/script/coverage.sh +++ b/script/coverage.sh @@ -6,7 +6,6 @@ set -o pipefail main() { _cd_into_top_level _generate_coverage_files - _combine_coverage_reports } _cd_into_top_level() { @@ -22,8 +21,4 @@ _generate_coverage_files() { } -_combine_coverage_reports() { - gover -} - main "$@" \ No newline at end of file