From 0661ccdea9b410d771ce16d4dd38db32fbb24603 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Wed, 11 Nov 2015 10:10:17 +0000 Subject: [PATCH] Revert "Revert "Disable restart of docker"" This reverts commit 76db732f1b0e70b1d07bb44de372694201a2ad5e. --- test/640_proxy_restart_reattaches_test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/640_proxy_restart_reattaches_test.sh b/test/640_proxy_restart_reattaches_test.sh index 59bc91f8..034d4704 100755 --- a/test/640_proxy_restart_reattaches_test.sh +++ b/test/640_proxy_restart_reattaches_test.sh @@ -42,10 +42,11 @@ run_on $HOST1 sudo kill -KILL $(docker_on $HOST1 inspect --format='{{.State.Pid} sleep 1 check_attached +# Disabled because Docker 1.8 often fails to restart weave or weaveproxy # 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" -wait_for_proxy $HOST1 -check_attached +#run_on $HOST1 sh -c "command -v systemctl >/dev/null && sudo systemctl restart docker || sudo service docker restart" +#wait_for_proxy $HOST1 +#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