From 2c501635b4c3e5af7a31b849ee35895356f15e34 Mon Sep 17 00:00:00 2001
From: Ben Hood <0x6e6562@gmail.com>
Date: Thu, 30 Oct 2014 15:10:34 +0000
Subject: [PATCH] Set a timeout on the integration tests

---
 integration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration.sh b/integration.sh
index 1092afe14..9656d543f 100755
--- a/integration.sh
+++ b/integration.sh
@@ -24,7 +24,7 @@ function run_tests() {
 		proto=1
 	fi
 
-	go test -tags integration -cover -v -runssl -proto=$proto -rf=3 -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=2000ms ./... | tee results.txt
+	go test -timeout 3m -tags integration -cover -v -runssl -proto=$proto -rf=3 -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=2000ms ./... | tee results.txt
 
 	cover=`cat results.txt | grep coverage: | grep -o "[0-9]\{1,3\}" | head -n 1`
 	if [[ $cover -lt "60" ]]; then