From c27ad1390d9371a948f096dbb9dfbc19e1042d82 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 16 Jun 2014 19:27:59 -0700 Subject: [PATCH] etcd does some trickery that was avoiding the pid capturing in our tests. Run in subshell. --- hack/integration-test.sh | 2 +- hack/local-up-cluster.sh | 2 +- hack/local-up.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/integration-test.sh b/hack/integration-test.sh index cc0b79f8485..482b15cc5fc 100755 --- a/hack/integration-test.sh +++ b/hack/integration-test.sh @@ -27,7 +27,7 @@ $(dirname $0)/build-go.sh ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX) trap "rm -rf ${ETCD_DIR}" EXIT -etcd -name test -data-dir ${ETCD_DIR} > /tmp/etcd.log & +(etcd -name test -data-dir ${ETCD_DIR} > /tmp/etcd.log) & ETCD_PID=$! sleep 5 diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 36b1c44e6ec..95f9406aa2b 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -33,7 +33,7 @@ echo "Starting etcd" ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX) trap "rm -rf ${ETCD_DIR}" EXIT -etcd -name test -data-dir ${ETCD_DIR} &> /tmp/etcd.log & +(etcd -name test -data-dir ${ETCD_DIR} &> /tmp/etcd.log) & ETCD_PID=$! sleep 5 diff --git a/hack/local-up.sh b/hack/local-up.sh index 1308420ee7e..ff1ee378772 100755 --- a/hack/local-up.sh +++ b/hack/local-up.sh @@ -40,7 +40,7 @@ echo "Starting etcd" ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX) trap "rm -rf ${ETCD_DIR}" EXIT -etcd -name test -data-dir ${ETCD_DIR} > /tmp/etcd.log & +(etcd -name test -data-dir ${ETCD_DIR} > /tmp/etcd.log) & ETCD_PID=$! sleep 5