From 535a6ae199708966c11f81a884586a72845ad8aa Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 16 May 2015 19:56:17 +0100 Subject: [PATCH] consistent `docker run` parameter order --- test/210_dns_multicast_test.sh | 2 +- test/250_dns_ipam_test.sh | 2 +- test/300_fallback_dns_test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/210_dns_multicast_test.sh b/test/210_dns_multicast_test.sh index a315028e..fd22b0fe 100755 --- a/test/210_dns_multicast_test.sh +++ b/test/210_dns_multicast_test.sh @@ -15,7 +15,7 @@ weave_on $HOST1 launch-dns 10.2.254.1/24 -debug weave_on $HOST2 launch-dns 10.2.254.2/24 -debug weave_on $HOST2 run $C2/24 -t --name=c2 -h $NAME gliderlabs/alpine /bin/sh -weave_on $HOST1 run --with-dns $C1/24 --name=c1 -t aanand/docker-dnsutils /bin/sh +weave_on $HOST1 run --with-dns $C1/24 -t --name=c1 aanand/docker-dnsutils /bin/sh assert_dns_record $HOST1 c1 $NAME $C2 diff --git a/test/250_dns_ipam_test.sh b/test/250_dns_ipam_test.sh index c0e7a931..347ff28a 100755 --- a/test/250_dns_ipam_test.sh +++ b/test/250_dns_ipam_test.sh @@ -14,7 +14,7 @@ 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 $NAME gliderlabs/alpine /bin/sh -weave_on $HOST1 run --with-dns --name=c1 -t aanand/docker-dnsutils /bin/sh +weave_on $HOST1 run --with-dns -t --name=c1 aanand/docker-dnsutils /bin/sh C2=$(container_ip $HOST2 c2) assert_dns_record $HOST1 c1 $NAME $C2 diff --git a/test/300_fallback_dns_test.sh b/test/300_fallback_dns_test.sh index c9f94b94..f654b01b 100755 --- a/test/300_fallback_dns_test.sh +++ b/test/300_fallback_dns_test.sh @@ -6,7 +6,7 @@ start_suite "Resolve a non-weave address" weave_on $HOST1 launch-dns 10.2.254.1/24 -debug -weave_on $HOST1 run --with-dns 10.2.1.5/24 --name=c1 -t aanand/docker-dnsutils /bin/sh +weave_on $HOST1 run --with-dns 10.2.1.5/24 -t --name=c1 aanand/docker-dnsutils /bin/sh assert_raises "exec_on $HOST1 c1 host -t mx weave.works | grep google" assert_raises "exec_on $HOST1 c1 getent hosts 8.8.8.8 | grep google"