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
37 lines
1.3 KiB
Bash
Executable File
37 lines
1.3 KiB
Bash
Executable File
#! /bin/bash
|
|
|
|
. "$(dirname "$0")/config.sh"
|
|
|
|
UNIVERSE=10.2.2.0/24
|
|
|
|
assert_no_ethwe() {
|
|
assert_raises "container_ip $1 $2" 1
|
|
assert_raises "proxy exec_on $1 $2 ip link show | grep -v ethwe"
|
|
}
|
|
|
|
start_suite "Ping proxied containers over cross-host weave network (with IPAM)"
|
|
|
|
weave_on $HOST1 launch --ipalloc-range $UNIVERSE
|
|
weave_on $HOST2 launch --ipalloc-range $UNIVERSE --no-default-ipalloc $HOST1
|
|
|
|
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=nodocker --net=none
|
|
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
|
|
|
|
assert_raises "proxy exec_on $HOST1 auto $PING $(container_ip $HOST2 zero)"
|
|
assert_raises "proxy exec_on $HOST2 zero $PING $(container_ip $HOST1 auto)"
|
|
assert_raises "proxy exec_on $HOST2 zero $PING $(container_ip $HOST1 bridge)"
|
|
assert_raises "proxy exec_on $HOST2 zero $PING $(container_ip $HOST1 other)"
|
|
assert_raises "proxy exec_on $HOST2 zero $PING $(container_ip $HOST1 nodocker)"
|
|
|
|
assert_no_ethwe $HOST1 none
|
|
assert_no_ethwe $HOST2 no-default
|
|
assert_no_ethwe $HOST1 host
|
|
|
|
end_suite
|