Merge pull request kubernetes#645 from brendandburns/integration

Add a sanity check for existing etcd servers to the integration test script
duda · Jul 27, 2014 · f91bfe2 · f91bfe2
2 parents 5d12b63 + ea15e67
commit f91bfe2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/hack/integration-test.sh b/hack/integration-test.sh
@@ -19,6 +19,12 @@ if [ "$(which etcd)" == "" ]; then
 	exit 1
 fi
 
+running_etcd=$(ps -ef | grep etcd | grep -c name)
+if [ "$running_etcd" != "0" ]; then
+	echo "etcd appears to already be running on this machine, please kill and restart the test."
+	exit 1
+fi
+
 # Stop right away if the build fails
 set -e