Browse Source

fix running auth tests

Chris Bannister 9 years ago
parent
commit
1b41cdcc27
2 changed files with 6 additions and 5 deletions
  1. 0 1
      .travis.yml
  2. 6 4
      integration.sh

+ 0 - 1
.travis.yml

@@ -39,7 +39,6 @@ install:
 
 
 script:
 script:
   - set -e
   - set -e
-  - go test -v -tags unit
   - PATH=$PATH:$HOME/.local/bin bash integration.sh $CASS $AUTH
   - PATH=$PATH:$HOME/.local/bin bash integration.sh $CASS $AUTH
   - go vet .
   - go vet .
 
 

+ 6 - 4
integration.sh

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