Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Update vet/lint and fix vet error in collector test

  • Loading branch information...
johnmccabe committed May 23, 2018
1 parent 57133d3 commit 1147f7242e3be0e8cc5c1798d196f8d24b7cf091
Showing with 12 additions and 11 deletions.
  1. +1 −1 .travis.yml
  2. +10 −9 Makefile
  3. +1 −1 collector/collector_test.go
@@ -20,7 +20,7 @@ matrix:
language: go
install: make bootstrap
script:
- make vendor test
- make test
- language: ruby
rvm: 2.3.4
cache: bundler
@@ -28,7 +28,7 @@ test: lint vet
watch: bootstrap
goconvey

bin/lumogon: bootstrap vendor
bin/lumogon: bootstrap
mkdir -p bin
GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -a -ldflags '$(LDFLAGS)' -o bin/lumogon lumogon.go

@@ -45,29 +45,30 @@ deploy: image
todo:
grep -rnw "TODO" .

lint: bootstrap $(GOPATH)/src/github.com/golang/lint/golint
golint ./...
lint: bootstrap
@echo "Linting..."
@for d in $$(go list ./... | grep -v /vendor/); do golint $${d}; done

vet: bootstrap
go vet ./...
@for d in $$(go list ./... | grep -v /vendor/); do go vet $${d}; done

licenses: $(GOPATH)/bin/licenses
@licenses $(PACKAGE_NAME) | grep $(PACKAGE_NAME)/vendor

all: clean vendor test build image puppet-module
all: clean test build image puppet-module

$(GOPATH)/src/github.com/golang/lint/golint:
go get -u github.com/golang/lint/golint
$(GOPATH)/bin/golint:
go get -u golang.org/x/lint/golint

$(GOPATH)/bin/licenses:
go get -u github.com/pmezard/licenses

$(GOPATH)/bin/goconvey:
go get -u github.com/smartystreets/goconvey

bootstrap: $(GOPATH)/src/github.com/golang/lint/golint $(GOPATH)/bin/licenses $(GOPATH)/bin/goconvey
bootstrap: $(GOPATH)/bin/golint $(GOPATH)/bin/licenses $(GOPATH)/bin/goconvey

puppet-module:
cd contrib/puppetlabs-lumogon; make all

.PHONY: build image test todo clean vendor bootstrap licenses watch deploy puppet-module
.PHONY: build image test todo clean bootstrap licenses watch deploy puppet-module
@@ -68,7 +68,7 @@ func Test_collector(t *testing.T) {
// a global
t.Run(test.title, func(t *testing.T) {
if testing.Short() {
t.Skip("skipping in short mode: %s", t.Name())
t.Skipf("skipping in short mode: %s", t.Name())
}

t.Logf("starting: %s, test timeout: %d", t.Name(), test.testTimeoutSec)

0 comments on commit 1147f72

Please sign in to comment.
You can’t perform that action at this time.