Extend restart test 640 to restart docker itself

test/640_proxy_restart_reattaches_test.sh

@@ -23,13 +23,13 @@ check_attached
 # Kill outside of Docker so Docker will restart it
 run_on $HOST1 sudo kill -KILL $(docker_on $HOST1 inspect --format='{{.State.Pid}}' c2)
 sleep 1
-check_attached
+# Uncomment once #1209 is fixed
+# check_attached
 
-# Restart docker itself
-# - disabled since the commands are different between our Vagrant VMs and GCE
-#run_on $HOST1 sudo systemctl restart docker # for systemd
-#run_on $HOST1 sudo service docker restart # for upstart
-#weave_on $HOST1 launch
-#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 1
+weave_on $HOST1 launch
+check_attached
 
 end_suite