From ac4b8be5e47c976816bdb1d4b11d00ae5a72c1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Thu, 5 Mar 2020 22:37:36 +0000 Subject: [PATCH 1/3] fix(tests): report total go coverage while running tests --- scripts/gocover.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/gocover.sh b/scripts/gocover.sh index 6139327bd..0c4a65e93 100755 --- a/scripts/gocover.sh +++ b/scripts/gocover.sh @@ -2,6 +2,13 @@ set -e +trap cleanup INT + +function cleanup() { + rm -f coverage.txt coverage.out profile.out + exit +} + echo "" > coverage.txt for d in $(go list ./... | grep -vE 'prymitive/karma/internal/mapper/v017/(client|models)'); do @@ -14,3 +21,8 @@ for d in $(go list ./... | grep -vE 'prymitive/karma/internal/mapper/v017/(clien rm profile.out fi done + +echo "mode: set" > coverage.out +cat coverage.txt | grep -v "mode: set" | grep -vE '^$' | grep -vE '^github.com/prymitive/karma/cmd/karma/bindata_assetfs.go:' >> coverage.out +mv coverage.out coverage.txt +go tool cover -func coverage.txt | tail -n 1 | awk '{print $3}' From 3d9ecfb7793bf666abc484a8f6ef32bb76ee3a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Thu, 5 Mar 2020 23:17:03 +0000 Subject: [PATCH 2/3] fix(tests): fix exit code for failed tests --- scripts/gocover.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/gocover.sh b/scripts/gocover.sh index 0c4a65e93..35bc62948 100755 --- a/scripts/gocover.sh +++ b/scripts/gocover.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -e +set -o errexit +set -o pipefail trap cleanup INT @@ -11,11 +12,12 @@ function cleanup() { echo "" > coverage.txt -for d in $(go list ./... | grep -vE 'prymitive/karma/internal/mapper/v017/(client|models)'); do - go test \ - -coverprofile=profile.out \ - -coverpkg=$(go list ./... | grep -vE 'prymitive/karma/internal/mapper/v017/(client|models)' | tr '\n' ',') \ - $d 2>&1 | grep -v 'warning: no packages being tested depend on matches for pattern' | sed s/'of statements in .*'/''/g +PKGS=$(go list ./... | grep -vE 'prymitive/karma/internal/mapper/v017/(client|models)') +COVERPKG=$(echo "$PKGS" | tr '\n' ',') +for d in $PKGS; do + (go test -coverprofile=profile.out -coverpkg="$COVERPKG" $d 2>&1 || exit 2) \ + | grep -v 'warning: no packages being tested depend on matches for pattern' \ + | sed s/'of statements in .*'/''/g if [ -f profile.out ]; then cat profile.out >> coverage.txt rm profile.out From 88b287f81f74f19cf3d9775c3fc73c4de78aceda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Thu, 5 Mar 2020 23:32:51 +0000 Subject: [PATCH 3/3] fix(backend): force mime type for ico files --- cmd/karma/main.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/karma/main.go b/cmd/karma/main.go index 26d1c426d..4732aae52 100644 --- a/cmd/karma/main.go +++ b/cmd/karma/main.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "html/template" + "mime" "net/http" "os" "os/signal" @@ -89,6 +90,8 @@ func headerAuth(name, valueRegex string) gin.HandlerFunc { } func setupRouter(router *gin.Engine) { + _ = mime.AddExtensionType(".ico", "image/x-icon") + router.Use(gzip.Gzip(gzip.DefaultCompression)) router.Use(setStaticHeaders(getViewURL("/static/")))