From aa4efd63ef3dcbe312a626cb2c1b7638e7342ca1 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 22 Jul 2015 16:55:43 +0100 Subject: [PATCH] cosmetic: uncomment test the way ordained by emacs --- test/210_dns_cross_hosts_test.sh | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/test/210_dns_cross_hosts_test.sh b/test/210_dns_cross_hosts_test.sh index 36888980..82e1ac6a 100755 --- a/test/210_dns_cross_hosts_test.sh +++ b/test/210_dns_cross_hosts_test.sh @@ -22,44 +22,44 @@ start_container_with_dns $HOST1 $C1/24 --name=c1 assert_dns_record $HOST1 c1 $NAME2 $C2 -# 2 containers on each host, all with the same names -#FOO_IPS= -#for host in $HOSTS; do +# # 2 containers on each host, all with the same names +# FOO_IPS= +# for host in $HOSTS; do # CID=$(proxy docker_on $host run -dti --name=foo $SMALL_IMAGE /bin/sh) # FOO_IPS="$FOO_IPS $(container_ip $host foo)" -# + # CID=$(proxy docker_on $host run -dti --name=bar $SMALL_IMAGE /bin/sh) # BAR_IPS="$BAR_IPS $(container_ip $host bar)" -#done -# -#start_container_with_dns $HOST1 --name=baz -#assert_dns_record $HOST1 baz foo.weave.local $FOO_IPS -#assert_dns_record $HOST1 baz bar.weave.local $BAR_IPS -# -## now stop and start the containers a bunch of times -## this tests gossip dns tombstone behaviour -#for i in $(seq 5); do +# done + +# start_container_with_dns $HOST1 --name=baz +# assert_dns_record $HOST1 baz foo.weave.local $FOO_IPS +# assert_dns_record $HOST1 baz bar.weave.local $BAR_IPS + +# # now stop and start the containers a bunch of times; this tests +# # gossip dns tombstone behaviour +# for i in $(seq 5); do # for host in $HOSTS; do # proxy docker_on $host kill foo 1>/dev/null # proxy docker_on $host kill bar 1>/dev/null # done -# + # assert_no_dns_record $HOST1 baz foo.weave.local # assert_no_dns_record $HOST1 baz bar.weave.local -# + # FOO_IPS= # BAR_IPS= # for host in $HOSTS; do # proxy docker_on $host start foo 1>/dev/null # proxy docker_on $host start bar 1>/dev/null -# + # FOO_IPS="$FOO_IPS $(container_ip $host foo)" # BAR_IPS="$BAR_IPS $(container_ip $host bar)" # done -# + # assert_dns_record $HOST1 baz foo.weave.local $FOO_IPS # assert_dns_record $HOST1 baz bar.weave.local $BAR_IPS -#done +# done # resolution for names mapped to multiple addresses weave_on $HOST2 dns-add $C2a c2 -h $NAME2