Commit f91bfe2e authored by Clayton Coleman's avatar Clayton Coleman

Merge pull request #645 from brendandburns/integration

Add a sanity check for existing etcd servers to the integration test script
parents 5d12b63b ea15e670
...@@ -19,6 +19,12 @@ if [ "$(which etcd)" == "" ]; then ...@@ -19,6 +19,12 @@ if [ "$(which etcd)" == "" ]; then
exit 1 exit 1
fi 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 # Stop right away if the build fails
set -e set -e
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment