Merge pull request kubernetes#5924 from fgrzadkowski/fix_integration

Wait for etcd shutdown in integration tests
duda · Mar 25, 2015 · 2ad3af2 · 2ad3af2
2 parents 1f50bd2 + aa9e25f
commit 2ad3af2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
@@ -50,5 +50,6 @@ kube::etcd::start() {
 
 kube::etcd::cleanup() {
   kill "${ETCD_PID-}" >/dev/null 2>&1 || :
+  wait "${ETCD_PID-}" >/dev/null 2>&1 || :
   rm -rf "${ETCD_DIR-}"
 }