Marc CARRE
2c7693b2c5
Remove tests of situations that don't exist any more and fix the following tests: - Fix test 660: pass arguments in correct order. - Fix test 620: no double launch, weave stop instead of kill -9. - Now that router and proxy have been merged, we should only call `weave launch` once. - `sudo kill -9` was introduced because we previously had `docker kill` (see: http://github.com/weaveworks/weave/commit/cb73b738621d57727072ae998cdeaec337f23a1a), because we had no `weave stop-proxy` yet (see: http://github.com/weaveworks/weave/commit/e31f21a6d224d61de1d8a940ea4b0b45cebc9723). Pre-proxy-merge, this should just have been `weave stop-proxy`, and now that router and proxy have been merged, we should just call `weave stop`. - Fix test 650: no double launch. - Fix test 630: remove redundant case & assertions. - Fix test 090: remove irrelevant assertions. PING
23 lines
708 B
Bash
Executable File
23 lines
708 B
Bash
Executable File
#! /bin/bash
|
|
|
|
. "$(dirname "$0")/config.sh"
|
|
|
|
start_suite "Test docker restart policy"
|
|
|
|
weave_on $HOST1 launch
|
|
assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave" "always"
|
|
assert_raises "check_restart $HOST1 weave"
|
|
|
|
# stop + launch tests that restart policy changes result
|
|
# in the old containers being removed and new ones created
|
|
weave_on $HOST1 stop
|
|
weave_on $HOST1 launch --no-restart
|
|
assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave weaveproxy" "no"
|
|
assert_raises "! check_restart $HOST1 weave"
|
|
|
|
# Relaunch to prevent the `weave stop` in `end_suite`
|
|
# timing out trying to remove the plugin network
|
|
weave_on $HOST1 launch --no-restart
|
|
|
|
end_suite
|