Change all launch-*/stop-* commands to launch/stop.

Given `proxy` & `router` processes have been merged, `launch-proxy`,
`launch-router`, `stop-proxy`, `stop-router` do not make sense any more, and
should just be `launch` and `stop` with the appropriate flags.
This commit is contained in:
Marc CARRE authored and Bryan Boreham committed 2017-05-10 10:25:36 +00:00
1 parent b654ac178c
commit 43249a8d39
31 files changed
+91 -102

No files matched your search

+3 -3
View File
@@ -15,7 +15,7 @@ run_container() {
}
start_suite "Proxy uses correct entrypoint and command with weavewait"
weave_on $HOST1 launch-proxy --no-restart
weave_on $HOST1 launch --no-restart
build_image check-ethwe-up '["grep"]' '["^1$", "/sys/class/net/ethwe/carrier"]'
run_container "check-ethwe-up"
@@ -26,13 +26,13 @@ run_container "grep ^1$ /sys/class/net/ethwe/carrier"
build_image false '["/bin/false"]' ''
run_container "--entrypoint='grep' false ^1$ /sys/class/net/ethwe/carrier"
weave_on $HOST1 launch-router --ipalloc-range 10.2.2.0/24
weave_on $HOST1 launch --ipalloc-range 10.2.2.0/24
# NOTE: docker-kill hangs (https://github.com/docker/docker/issues/31447), so we
# kill directly the weaveproxy process instead.
WEAVEPROXY_PID=$(container_pid $HOST1 weaveproxy)
$SSH $HOST1 "ps aux | grep weaveproxy"
run_on $HOST1 "sudo kill -9 $WEAVEPROXY_PID"
weave_on $HOST1 launch-proxy
weave_on $HOST1 launch
assert_raises "proxy docker_on $HOST1 run check-ethwe-up"