浏览代码

increase timeouts for tests

Chris Bannister 9 年之前
父节点
当前提交
68a9e83a04
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      common_test.go
  2. 2 2
      integration.sh

+ 1 - 1
common_test.go

@@ -88,7 +88,7 @@ func createCluster() *ClusterConfig {
 func createKeyspace(tb testing.TB, cluster *ClusterConfig, keyspace string) {
 	c := *cluster
 	c.Keyspace = "system"
-	c.Timeout = 20 * time.Second
+	c.Timeout = 30 * time.Second
 	session, err := c.CreateSession()
 	if err != nil {
 		tb.Fatal("createSession:", err)

+ 2 - 2
integration.sh

@@ -65,7 +65,7 @@ function run_tests() {
 		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=10s -runssl -proto=$proto -rf=3 -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=2000ms -compressor=snappy ./...
+		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:"
@@ -77,7 +77,7 @@ function run_tests() {
 			exit 1
 		fi
 
-		go test -timeout 10m -tags "ccm gocql_debug" -v -gocql.timeout=10s -runssl -proto=$proto -rf=3 -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=2000ms -compressor=snappy ./...
+		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 ./...
 	fi
 
 	ccm remove