Explorar o código

remove unused test code, reset the ccm data between runs

Chris Bannister %!s(int64=9) %!d(string=hai) anos
pai
achega
0a1894a023
Modificáronse 1 ficheiros con 4 adicións e 12 borrados
  1. 4 12
      integration.sh

+ 4 - 12
integration.sh

@@ -64,20 +64,12 @@ function run_tests() {
 		sleep 30s
 		go test -v . -timeout 15s -run=TestAuthentication -tags "integration gocql_debug" -runssl -runauth -proto=$proto -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=1000ms
 	else
-
 		go test -tags "integration gocql_debug" -timeout 10m -v -gocql.timeout=30s -runssl -proto=$proto -rf=3 -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=2000ms -compressor=snappy ./...
 
-		if [ ${PIPESTATUS[0]} -ne 0 ]; then
-			echo "--- FAIL: ccm status follows:"
-			ccm status
-			ccm node1 nodetool status
-			ccm node1 showlog > status.log
-			cat status.log
-			echo "--- FAIL: Received a non-zero exit code from the go test execution, please investigate this"
-			exit 1
-		fi
-
-		go test -timeout 10m -tags "ccm gocql_debug" -v -gocql.timeout=30s -runssl -proto=$proto -rf=3 -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=2000ms -compressor=snappy ./...
+		ccm clear
+		ccm start
+
+		go test -tags "ccm gocql_debug" -timeout 10m -v -gocql.timeout=30s -runssl -proto=$proto -rf=3 -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=2000ms -compressor=snappy ./...
 	fi
 
 	ccm remove