extract test functions for "start container via proxy"

This also eliminates the redefinition of 'start_container' by some of
the tests, which causes failures when multiple tests are run with
`run_all.sh`.

Fixes #1294.
This commit is contained in:
Matthias Radestock committed 2015-08-13 15:01:15 +01:00
1 parent 90ed76853c
commit 65578211ef
5 files changed
+27 -25

No files matched your search

+7 -13
View File
@@ -4,12 +4,6 @@
UNIVERSE=10.2.2.0/24
start() {
host=$1
shift
proxy docker_on "$host" run "$@" -dt $SMALL_IMAGE /bin/sh
}
assert_no_ethwe() {
assert_raises "container_ip $1 $2" 1
assert_raises "proxy exec_on $1 $2 ip link show | grep -v ethwe"
@@ -22,13 +16,13 @@ weave_on $HOST2 launch -iprange $UNIVERSE $HOST1
weave_on $HOST1 launch-proxy
weave_on $HOST2 launch-proxy --no-default-ipam
start $HOST1 --name=auto
start $HOST1 --name=none -e WEAVE_CIDR=none
start $HOST2 --name=zero -e WEAVE_CIDR=
start $HOST2 --name=no-default
start $HOST1 --name=bridge --net=bridge
start $HOST1 --name=host --net=host
start $HOST1 --name=other --net=container:auto
proxy_start_container $HOST1 --name=auto
proxy_start_container $HOST1 --name=none -e WEAVE_CIDR=none
proxy_start_container $HOST2 --name=zero -e WEAVE_CIDR=
proxy_start_container $HOST2 --name=no-default
proxy_start_container $HOST1 --name=bridge --net=bridge
proxy_start_container $HOST1 --name=host --net=host
proxy_start_container $HOST1 --name=other --net=container:auto
AUTO=$(container_ip $HOST1 auto)
ZERO=$(container_ip $HOST2 zero)