From 8621aa7cbfaed7ed40123172adcc16b9a3723b3b Mon Sep 17 00:00:00 2001 From: Alvaro Saurin Date: Tue, 16 Jun 2015 14:33:56 +0200 Subject: [PATCH] Launch WeaveDNS with --debug when DEBUG is set --- test/200_dns_test.sh | 2 +- test/210_dns_multicast_test.sh | 4 ++-- test/220_dns_custom_test.sh | 2 +- test/230_dns_unqualified_test.sh | 2 +- test/240_dns_add_name_test.sh | 2 +- test/260_dns_removal_test.sh | 2 +- test/290_dns_fallback_test.sh | 5 ++++- test/500_weave_multi_cidr_test.sh | 2 +- test/630_proxy_dns_test.sh | 2 +- test/640_proxy_restart_reattaches_test.sh | 2 +- test/config.sh | 3 +++ 11 files changed, 17 insertions(+), 11 deletions(-) diff --git a/test/200_dns_test.sh b/test/200_dns_test.sh index 6ccfb627..569eb4d9 100755 --- a/test/200_dns_test.sh +++ b/test/200_dns_test.sh @@ -8,7 +8,7 @@ NAME=seetwo.weave.local start_suite "Resolve names on a single host" -weave_on $HOST1 launch-dns 10.2.254.1/24 +weave_on $HOST1 launch-dns 10.2.254.1/24 $WEAVEDNS_ARGS start_container $HOST1 $C2/24 --name=c2 -h $NAME start_container_with_dns $HOST1 $C1/24 --name=c1 diff --git a/test/210_dns_multicast_test.sh b/test/210_dns_multicast_test.sh index bbb323fb..d72135ae 100755 --- a/test/210_dns_multicast_test.sh +++ b/test/210_dns_multicast_test.sh @@ -11,8 +11,8 @@ NAME2=seetwo.weave.local NAME4=seefour.weave.local start() { - weave_on $HOST1 launch-dns $1 >/dev/null - weave_on $HOST2 launch-dns $2 >/dev/null + weave_on $HOST1 launch-dns $1 $WEAVEDNS_ARGS >/dev/null + weave_on $HOST2 launch-dns $2 $WEAVEDNS_ARGS >/dev/null } stop() { diff --git a/test/220_dns_custom_test.sh b/test/220_dns_custom_test.sh index 44f40231..9a9043ea 100755 --- a/test/220_dns_custom_test.sh +++ b/test/220_dns_custom_test.sh @@ -9,7 +9,7 @@ NAME=seetwo.$DOMAIN start_suite "Resolve names in custom domain" -weave_on $HOST1 launch-dns 10.2.254.1/24 --domain $DOMAIN. +weave_on $HOST1 launch-dns 10.2.254.1/24 --domain $DOMAIN. $WEAVEDNS_ARGS start_container $HOST1 $C2/24 --name=c2 -h $NAME start_container_with_dns $HOST1 $C1/24 --name=c1 diff --git a/test/230_dns_unqualified_test.sh b/test/230_dns_unqualified_test.sh index 574fef06..33b4c504 100755 --- a/test/230_dns_unqualified_test.sh +++ b/test/230_dns_unqualified_test.sh @@ -10,7 +10,7 @@ NAME=seeone.$DOMAIN start_suite "Resolve unqualified names" -weave_on $HOST1 launch-dns 10.2.254.1/24 +weave_on $HOST1 launch-dns 10.2.254.1/24 $WEAVEDNS_ARGS start_container $HOST1 $C1/24 --name=c1 -h $NAME start_container_with_dns $HOST1 $C2/24 --name=c2 -h seetwo.$DOMAIN diff --git a/test/240_dns_add_name_test.sh b/test/240_dns_add_name_test.sh index f29df2e4..176354f6 100755 --- a/test/240_dns_add_name_test.sh +++ b/test/240_dns_add_name_test.sh @@ -10,7 +10,7 @@ NAME3=seethree.weave.local start_suite "Add and remove names on a single host" -weave_on $HOST1 launch-dns 10.2.254.1/24 --no-cache +weave_on $HOST1 launch-dns 10.2.254.1/24 $WEAVEDNS_ARGS start_container $HOST1 $C2/24 --name=c2 start_container_with_dns $HOST1 $C1/24 --name=c1 diff --git a/test/260_dns_removal_test.sh b/test/260_dns_removal_test.sh index 9a1ffdb8..92b90faa 100755 --- a/test/260_dns_removal_test.sh +++ b/test/260_dns_removal_test.sh @@ -16,7 +16,7 @@ check() { start_suite "Automatic DNS record removal on container death" -weave_on $HOST1 launch-dns 10.2.254.1/24 --no-cache +weave_on $HOST1 launch-dns 10.2.254.1/24 $WEAVEDNS_ARGS start_container_with_dns $HOST1 $C1/24 --name=c1 start_container $HOST1 $C2/24 $DOPTS diff --git a/test/290_dns_fallback_test.sh b/test/290_dns_fallback_test.sh index 0ea0cf03..abcd5bc4 100755 --- a/test/290_dns_fallback_test.sh +++ b/test/290_dns_fallback_test.sh @@ -2,9 +2,12 @@ . ./config.sh +DNS_ARGS="--no-cache" +[ -n "$DEBUG" ] && DNS_ARGS="--debug" + start_suite "Resolve a non-weave address" -weave_on $HOST1 launch-dns 10.2.254.1/24 --no-cache +weave_on $HOST1 launch-dns 10.2.254.1/24 $WEAVEDNS_ARGS start_container_with_dns $HOST1 10.2.1.5/24 --name=c1 diff --git a/test/500_weave_multi_cidr_test.sh b/test/500_weave_multi_cidr_test.sh index 2d392715..3bedd01d 100755 --- a/test/500_weave_multi_cidr_test.sh +++ b/test/500_weave_multi_cidr_test.sh @@ -47,7 +47,7 @@ start_suite "Weave run/start/attach/detach with multiple cidr arguments" # lowest available address in the subnet weave_on $HOST1 launch -debug -iprange 10.2.3.0/24 -weave_on $HOST1 launch-dns 10.254.254.254/24 +weave_on $HOST1 launch-dns 10.254.254.254/24 $WEAVEDNS_ARGS # Run container with three cidrs CID=$(start_container $HOST1 ip:10.2.1.1/24 10.2.2.1/24 net:10.2.3.0/24 --name=multicidr -h $NAME | cut -b 1-12) diff --git a/test/630_proxy_dns_test.sh b/test/630_proxy_dns_test.sh index ddc9b2d4..e0284f60 100755 --- a/test/630_proxy_dns_test.sh +++ b/test/630_proxy_dns_test.sh @@ -9,7 +9,7 @@ C2_NAME=seetwo.weave.local start_suite "Proxy registers containers with dns" -weave_on $HOST1 launch-dns 10.2.254.1/24 +weave_on $HOST1 launch-dns 10.2.254.1/24 $WEAVEDNS_ARGS weave_on $HOST1 launch-proxy --with-dns proxy docker_on $HOST1 run -e WEAVE_CIDR=$C2/24 -dt --name=c2 -h $C2_NAME $DNS_IMAGE /bin/sh proxy docker_on $HOST1 run -e WEAVE_CIDR=$C1/24 -dt --name=c1 $DNS_IMAGE /bin/sh diff --git a/test/640_proxy_restart_reattaches_test.sh b/test/640_proxy_restart_reattaches_test.sh index eff1effb..b189957e 100755 --- a/test/640_proxy_restart_reattaches_test.sh +++ b/test/640_proxy_restart_reattaches_test.sh @@ -8,7 +8,7 @@ NAME=seetwo.weave.local start_suite "Proxy restart reattaches networking to containers" -weave_on $HOST1 launch-dns 10.2.254.1/24 +weave_on $HOST1 launch-dns 10.2.254.1/24 $WEAVEDNS_ARGS weave_on $HOST1 launch-proxy --with-dns proxy docker_on $HOST1 run -e WEAVE_CIDR=$C2/24 -dt --name=c2 -h $NAME $SMALL_IMAGE /bin/sh proxy docker_on $HOST1 run -e WEAVE_CIDR=$C1/24 -dt --name=c1 $DNS_IMAGE /bin/sh diff --git a/test/config.sh b/test/config.sh index 812dde27..ba0f5436 100644 --- a/test/config.sh +++ b/test/config.sh @@ -36,6 +36,9 @@ CHECK_ETHWE_UP="grep ^1$ /sys/class/net/ethwe/carrier" DOCKER_PORT=2375 +WEAVEDNS_ARGS="--no-cache" +[ -n "$DEBUG" ] && WEAVEDNS_ARGS="--debug" + remote() { rem=$1 shift 1