Merge pull request #366 from bookingcom/grzkv/ci_fix

Fixing errors in CI that succeeds.

Author: grzkv

.github/workflows/ci.yml

@@ -20,8 +20,8 @@ jobs:
         run: sudo apt-get install libcairo2-dev -y
       - name: checkout code
         uses: actions/checkout@v2
-      - name: check
-        run: make all check
+      - name: test
+        run: make test
       - name: integration test
         run: tests/system_test.sh
   golangci:

Makefile

@@ -32,16 +32,11 @@ build:
 	$(PKGCONF) $(GO) build -mod vendor $(TAGS) $(LDFLAGS) $(GCFLAGS) $(PKG_CARBONAPI)
 	$(PKGCONF) $(GO) build -mod vendor $(TAGS) $(LDFLAGS) $(GCFLAGS) $(PKG_CARBONZIPPER)
 
-vet:
-	go vet -composites=false ./...
-
 lint:
 	golangci-lint run
 
-check: test vet
-
 test:
-	$(PKGCONF) $(GO) test ./... -v -race -coverprofile=coverage.txt -covermode=atomic
+	$(PKGCONF) $(GO) test ./... -race -coverprofile=coverage.txt -covermode=atomic
 
 clean:
 	rm -f carbonapi carbonzipper

app/carbonzipper/http_handlers_test.go

@@ -925,8 +925,6 @@ func TestInfoSingleBackend(t *testing.T) {
 			t.Fatalf("got code %d expected %d for %s", w.Code, tst.code, tst.path)
 		}
 
-		t.Log(w.Body.String())
-
 		if w.Body.String() != tst.body {
 			t.Fatalf("unexpected body: want %q got %q", tst.body, w.Body.String())
 		}

pkg/parser/parser_test.go

@@ -2,7 +2,6 @@ package parser
 
 import (
 	"reflect"
-	"regexp"
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
@@ -434,8 +433,6 @@ func TestParseExpr(t *testing.T) {
 		// for fixing golangci-lint: Using the variable on range scope `tt` in function literal
 		tt := ttr
 		t.Run(tt.s, func(t *testing.T) {
-			t.Logf("run case: go test -run 'TestParseExpr/%s'", regexp.QuoteMeta(tt.s))
-
 			e, _, err := ParseExpr(tt.s)
 			if err != tt.err {
 				t.Errorf(`parse for %+v expects error "%v" but received "%v"`, tt.s, tt.err, err)