use dnsutils image in one test instead of awk on all the tests.

This commit is contained in:
Paul Bellamy committed 2015-06-11 12:13:24 +01:00
1 parent 8d7fe2b9e7
commit d2b17690f9
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -11,8 +11,8 @@ start_suite "Proxy registers containers with dns"
weave_on $HOST1 launch-dns 10.2.254.1/24
weave_on $HOST1 launch-proxy --with-dns
proxy docker_on $HOST1 run -e WEAVE_CIDR=$C2/24 -dt --name=c2 -h $C2_NAME $SMALL_IMAGE /bin/sh
proxy docker_on $HOST1 run -e WEAVE_CIDR=$C1/24 -dt --name=c1 $DNS_IMAGE /bin/sh
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
assert_dns_record $HOST1 c1 $C2_NAME $C2
assert_dns_record $HOST1 c2 $C1_NAME $C1
+1 -1
View File
@@ -128,7 +128,7 @@ assert_dns_record() {
[ -z "$DEBUG" ] || greyly echo "Checking whether the IPs '$@' exists at $host:$container"
for ip in "$@" ; do
assert "exec_on $host $container getent hosts $ip | awk '{print \$2}'" "$name"
assert "exec_on $host $container getent hosts $ip | tr -s ' '" "$ip $name"
done
}