Merge pull request sorintlab#503 from sgotti/improve_test_script

test: improve test script

Author: sgotti

build

@@ -33,6 +33,9 @@ fi
 ORG_PATH="github.com/sorintlab"
 REPO_PATH="${ORG_PATH}/stolon"
 
+# Hack to be sure that:
+# * all the dependencies are vendored
+# * if cloned as another repo name it will compile anyway
 export GOPATH=${PWD}/gopath
 
 rm -f $GOPATH/src/${REPO_PATH}

cmd/stolonctl/cmd/promote.go

@@ -79,7 +79,7 @@ func promote(cmd *cobra.Command, args []string) {
 		}
 		cd.Cluster.Spec.Role = cluster.ClusterRoleP(cluster.ClusterRoleMaster)
 
-		if err := cd.Cluster.UpdateSpec(cd.Cluster.Spec); err != nil {
+		if err = cd.Cluster.UpdateSpec(cd.Cluster.Spec); err != nil {
 			die("Cannot update cluster spec: %v", err)
 		}
 

cmd/stolonctl/cmd/update.go

@@ -120,11 +120,11 @@ func update(cmd *cobra.Command, args []string) {
 				die("failed to patch cluster spec: %v", err)
 			}
 		} else {
-			if err := json.Unmarshal(data, &newcs); err != nil {
+			if err = json.Unmarshal(data, &newcs); err != nil {
 				die("failed to unmarshal cluster spec: %v", err)
 			}
 		}
-		if err := cd.Cluster.UpdateSpec(newcs); err != nil {
+		if err = cd.Cluster.UpdateSpec(newcs); err != nil {
 			die("Cannot update cluster spec: %v", err)
 		}
 

test

@@ -6,13 +6,8 @@
 # ./test
 # ./test -v
 #
-# Run tests for one package
-#
-# PKG=./wal ./test
-# PKG=snap ./test
-#
 # Run also integration tests
-# INTEGRATION=1 ./test
+# INTEGRATION=1 STOLON_TEST_STORE_BACKEND=etcdv3 ./test
 #
 set -e
 
@@ -23,58 +18,49 @@ if [ $PWD != $BASEDIR ]; then
 	cd $BASEDIR
 fi
 
-source ./build
+ORG_PATH="github.com/sorintlab"
+REPO_PATH="${ORG_PATH}/stolon"
 
-TESTABLE="cmd/keeper cmd/sentinel cmd/proxy pkg/cluster pkg/store pkg/flagutil pkg/postgresql pkg/util"
+./build
 
-# user has not provided PKG override
-if [ -z "$PKG" ]; then
-	TEST=$TESTABLE
-	FMT=$TESTABLE
+# Hack to be sure that:
+# * all the dependencies are vendored
+# * if cloned as another repo name it will compile anyway
+export GOPATH=${PWD}/gopath
 
-# user has provided PKG override
-else
-	# strip out leading dotslashes and trailing slashes from PKG=./foo/
-	TEST=${PKG/#./}
-	TEST=${TEST/#\//}
-	TEST=${TEST/%\//}
-
-	FMT=$TEST
-fi
+# test all packages excluding integration tests
+IGNORE_PKGS="(vendor/|tests/integration)"
+PACKAGES=$(find . -name \*_test.go | while read -r a; do dirname "$a"; done | sort | uniq | grep -vE "$IGNORE_PKGS" | sed "s|\./||g")
 
-# split TEST into an array and prepend REPO_PATH to each local package
-split=(${TEST// / })
-TEST=${split[@]/#/${REPO_PATH}/}
-split=(${NO_RACE_TEST// / })
-NO_RACE_TEST=${split[@]/#/${REPO_PATH}/}
+# prepend REPO_PATH to each local package
+split=$PACKAGES
+PACKAGES=""
+for a in $split; do PACKAGES="$PACKAGES ${REPO_PATH}/${a}"; done
 
 echo "Running tests..."
 
-# Invoke ./cover for HTML output
 COVER=${COVER:-"-cover"}
 
 echo "Checking gofmt..."
-fmtRes=$(gofmt -l $FMT)
+fmtRes=$(gofmt -l $(find . -type f -name '*.go' ! -path './vendor/*'))
 if [ -n "${fmtRes}" ]; then
 	echo -e "gofmt checking failed:\n${fmtRes}"
 	exit 255
 fi
 
 echo "Checking govet..."
-vetRes=$(go vet $TEST)
+vetRes=$(go vet ${PACKAGES})
 if [ -n "${vetRes}" ]; then
 	echo -e "govet checking failed:\n${vetRes}"
 	exit 255
 fi
 
 echo "Checking govet -shadow ..."
-for path in $FMT; do
-	vetRes=$(go tool vet -shadow ${path})
-	if [ -n "${vetRes}" ]; then
-		echo -e "govet checking ${path} failed:\n${vetRes}"
-		exit 255
-	fi
-done
+vetRes=$(go vet -shadow ${PACKAGES})
+if [ -n "${vetRes}" ]; then
+	echo -e "govet checking ${path} failed:\n${vetRes}"
+	exit 255
+fi
 
 echo "Checking for license header..."
 licRes=$(for file in $(find . -type f -iname '*.go' ! -path './vendor/*'); do
@@ -85,7 +71,7 @@ if [ -n "${licRes}" ]; then
 	exit 255
 fi
 
-go test -timeout 3m ${COVER} $@ ${TEST} ${RACE}
+go test -timeout 3m ${COVER} $@ ${PACKAGES} ${RACE}
 
 if [ -n "$INTEGRATION" ]; then
 	echo "Running integration tests..."