Skip to content

Commit

Permalink
Enable lint on go1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
billf committed Aug 21, 2016
1 parent d11d285 commit d17b61a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: false
go:
- 1.5
- 1.6
- 1.7rc6
- 1.7
- tip
env:
global:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PKG_FILES ?= *.go spy benchmarks zwrap zbark testutils
# stable release.
GO_VERSION := $(shell go version | cut -d " " -f 3)
GO_MINOR_VERSION := $(word 2,$(subst ., ,$(GO_VERSION)))
LINTABLE_MINOR_VERSIONS := 6
LINTABLE_MINOR_VERSIONS := 7
ifneq ($(filter $(LINTABLE_MINOR_VERSIONS),$(GO_MINOR_VERSION)),)
SHOULD_LINT := true
endif
Expand Down Expand Up @@ -42,7 +42,7 @@ ifdef SHOULD_LINT
@echo "Installing test dependencies for vet..."
@go test -i $(PKGS)
@echo "Checking vet..."
@$(foreach dir,$(PKG_FILES),go tool vet $(dir) 2>&1 | tee -a lint.log;)
@$(foreach dir,$(PKG_FILES),go tool vet $(dir) 2>&1 | $(VET_SKIP_ERRORF) | tee -a lint.log;)
@echo "Checking lint..."
@$(foreach dir,$(PKGS),golint $(dir) 2>&1 | tee -a lint.log;)
@echo "Checking for unresolved FIXMEs..."
Expand Down
2 changes: 1 addition & 1 deletion flag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func TestLevelFlag(t *testing.T) {

err := flag.CommandLine.Parse(tt.args)
if tt.wantErr {
assert.Error(t, err, "Parse(%v) should fail", tt.args)
assert.True(t, err != nil, "Parse(%v) should fail", tt.args)
continue
}

Expand Down

0 comments on commit d17b61a

Please sign in to comment.