From 822cab775084a007a69408de4daaf255034d05d2 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 16 May 2015 19:22:31 +0100 Subject: [PATCH] use assert_dns_record in ipam test instead of homegrown version that uses dig --- test/250_dns_ipam_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/250_dns_ipam_test.sh b/test/250_dns_ipam_test.sh index 7db9779f..c0e7a931 100755 --- a/test/250_dns_ipam_test.sh +++ b/test/250_dns_ipam_test.sh @@ -3,6 +3,7 @@ . ./config.sh UNIVERSE=10.2.3.0/24 +NAME=seetwo.weave.local start_suite "Resolve names over cross-host weave network with IPAM" @@ -12,11 +13,10 @@ weave_on $HOST2 launch -iprange $UNIVERSE $HOST1 weave_on $HOST1 launch-dns 10.2.254.1/24 weave_on $HOST2 launch-dns 10.2.254.2/24 -weave_on $HOST2 run -t --name=c2 -h seetwo.weave.local gliderlabs/alpine /bin/sh +weave_on $HOST2 run -t --name=c2 -h $NAME gliderlabs/alpine /bin/sh weave_on $HOST1 run --with-dns --name=c1 -t aanand/docker-dnsutils /bin/sh C2=$(container_ip $HOST2 c2) -assert "exec_on $HOST1 c1 dig +short seetwo.weave.local" "$C2" -assert "exec_on $HOST1 c1 dig +short -x $C2" "seetwo.weave.local." +assert_dns_record $HOST1 c1 $NAME $C2 end_suite