From 26d43f193e0ddbb9a76d743511a249d2ccb742b0 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 20 Oct 2015 07:07:04 +0000 Subject: [PATCH] Move docker restart test above the place where we stop part of weave --- test/640_proxy_restart_reattaches_test.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/640_proxy_restart_reattaches_test.sh b/test/640_proxy_restart_reattaches_test.sh index 703c3c56..521eae30 100755 --- a/test/640_proxy_restart_reattaches_test.sh +++ b/test/640_proxy_restart_reattaches_test.sh @@ -30,15 +30,15 @@ run_on $HOST1 sudo kill -KILL $(docker_on $HOST1 inspect --format='{{.State.Pid} sleep 1 check_attached +# Restart docker itself, using different commands for systemd- and upstart-managed. +run_on $HOST1 sh -c "command -v systemctl >/dev/null && sudo systemctl restart docker || sudo service docker restart" +sleep 5 +check_attached + # Restarting proxy shouldn't kill unattachable containers proxy_start_container $HOST1 -di --name=c3 --restart=always # Use ipam, so it won't be attachable w/o weave weave_on $HOST1 stop weave_on $HOST1 launch-proxy assert_raises "proxy exec_on $HOST1 c3 $CHECK_ETHWE_UP" -# Restart docker itself, using different commands for systemd- and upstart-managed. -run_on $HOST1 sh -c "command -v systemctl >/dev/null && sudo systemctl restart docker || sudo service docker restart" -sleep 5 -check_attached - end_suite