move testing to Makefile

The tests previously defined only for Travis CI are now invoked with
"make test".

e2e.sh assumed that the binaries are in the regular search path. This
is no longer necessary and in addition, mock is no longer placed in
the developers $GOPATH/bin by the script.

.travis.yml

@@ -3,10 +3,7 @@ matrix:
   include:
   - go: 1.10.3
 script:
-- go fmt $(go list ./... | grep -v vendor) | wc -l | grep 0
-- go vet $(go list ./... | grep -v vendor)
-- go test $(go list ./... | grep -v vendor | grep -v "cmd/csi-sanity")
-- ./hack/e2e.sh
+- make test
 after_success:
   - if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
       docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" quay.io;

Makefile

@@ -38,5 +38,14 @@ container: $(APP)
 push: container
 	docker push $(IMAGE_NAME):$(IMAGE_VERSION)
 
-.PHONY: all clean container push
-
+test:
+	if ! [ $$(go fmt $$(go list ./... | grep -v vendor) | wc -l) -eq 0 ]; then \
+		echo "formatting errors:"; \
+		go fmt $$(go list ./... | grep -v vendor); \
+		false; \
+	fi
+	go vet $$(go list ./... | grep -v vendor)
+	go test $$(go list ./... | grep -v vendor | grep -v "cmd/csi-sanity")
+	./hack/e2e.sh
+
+.PHONY: all clean container push test

hack/e2e.sh

@@ -11,10 +11,10 @@ CSI_MOCK_VERSION="master"
 #      See https://github.com/grpc/grpc/blob/master/doc/naming.md
 runTest()
 {
-	CSI_ENDPOINT=$1 mock &
+	CSI_ENDPOINT=$1 ./bin/mock &
 	local pid=$!
 
-	csi-sanity $TESTARGS --csi.endpoint=$2; ret=$?
+	./cmd/csi-sanity/csi-sanity $TESTARGS --csi.endpoint=$2; ret=$?
 	kill -9 $pid
 
 	if [ $ret -ne 0 ] ; then
@@ -24,18 +24,18 @@ runTest()
 
 runTestWithCreds()
 {
-	CSI_ENDPOINT=$1 CSI_ENABLE_CREDS=true mock &
+	CSI_ENDPOINT=$1 CSI_ENABLE_CREDS=true ./bin/mock &
 	local pid=$!
 
-	csi-sanity $TESTARGS --csi.endpoint=$2 --csi.secrets=mock/mocksecret.yaml; ret=$?
+	./cmd/csi-sanity/csi-sanity $TESTARGS --csi.endpoint=$2 --csi.secrets=mock/mocksecret.yaml; ret=$?
 	kill -9 $pid
 
 	if [ $ret -ne 0 ] ; then
 		exit $ret
 	fi
 }
 
-go install ./mock || exit 1
+go build -o bin/mock ./mock || exit 1
 
 cd cmd/csi-sanity
   make clean install || exit 1