Преглед на файлове

use consistent args for integration tests

Chris Bannister преди 9 години
родител
ревизия
74c7dafa42
променени са 1 файла, в които са добавени 5 реда и са изтрити 3 реда
  1. 5 3
      integration.sh

+ 5 - 3
integration.sh

@@ -59,19 +59,21 @@ function run_tests() {
 	ccm status
 	ccm node1 nodetool status
 
+	local args="-gocql.timeout=60s -runssl -proto=$proto -rf=3 -clusterSize=$clusterSize -autowait=2000ms -compressor=snappy -gocql.cversion=$version -cluster=$(ccm liveset) ./..."
+
 	if [ "$auth" = true ]
 	then
 		sleep 30s
-		go test -v . -timeout 15s -run=TestAuthentication -tags "integration gocql_debug" -runssl -runauth -proto=$proto -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=1000ms
+		go test -run=TestAuthentication -tags "integration gocql_debug" -timeout=15s -v $args
 	else
 		sleep 1s
-		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 ./...
+		go test -tags "integration gocql_debug" -timeout=5m -v $args
 
 		ccm clear
 		ccm start
 		sleep 1s
 
-		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 ./...
+		go test -tags "ccm gocql_debug" timeout=5m -v $args
 	fi
 
 	ccm remove