From 6dd6d9d6f06367c8cac0c073bc9fddeb7780e5c9 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 16 May 2015 21:53:50 +0100 Subject: [PATCH] one ping to rule them all --- test/100_cross_hosts_test.sh | 2 +- test/110_encryption_test.sh | 2 +- test/120_ipam_test.sh | 2 +- test/130_expose_test.sh | 2 -- test/140_ipam_expose_test.sh | 2 -- test/config.sh | 2 ++ test/sanity_check.sh | 4 ++-- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/test/100_cross_hosts_test.sh b/test/100_cross_hosts_test.sh index 9a5d535b..678b3f0e 100755 --- a/test/100_cross_hosts_test.sh +++ b/test/100_cross_hosts_test.sh @@ -12,6 +12,6 @@ weave_on $HOST2 launch $HOST1 start_container $HOST1 $C1/24 --name=c1 start_container $HOST2 $C2/24 --name=c2 -assert_raises "exec_on $HOST1 c1 ping -q -c 4 $C2" +assert_raises "exec_on $HOST1 c1 $PING $C2" end_suite diff --git a/test/110_encryption_test.sh b/test/110_encryption_test.sh index 0f16aaa6..967e0003 100755 --- a/test/110_encryption_test.sh +++ b/test/110_encryption_test.sh @@ -12,6 +12,6 @@ weave_on $HOST2 launch -password notverysecure $HOST1 start_container $HOST1 $C1/24 --name=c1 start_container $HOST2 $C2/24 --name=c2 -assert_raises "exec_on $HOST1 c1 ping -q -c 4 $C2" +assert_raises "exec_on $HOST1 c1 $PING $C2" end_suite diff --git a/test/120_ipam_test.sh b/test/120_ipam_test.sh index 23be4c1a..efd7c804 100755 --- a/test/120_ipam_test.sh +++ b/test/120_ipam_test.sh @@ -12,6 +12,6 @@ weave_on $HOST2 launch -iprange $UNIVERSE $HOST1 start_container $HOST1 --name=c1 start_container $HOST2 --name=c2 C2=$(container_ip $HOST2 c2) -assert_raises "exec_on $HOST1 c1 ping -q -c 4 $C2" +assert_raises "exec_on $HOST1 c1 $PING $C2" end_suite diff --git a/test/130_expose_test.sh b/test/130_expose_test.sh index 1984c76f..cacc3dfd 100755 --- a/test/130_expose_test.sh +++ b/test/130_expose_test.sh @@ -8,8 +8,6 @@ C3=10.2.2.34 C4=10.2.2.37 EXP=10.2.1.101 -PING="ping -nq -W 1 -c 1" - weave_on1() { assert_raises "weave_on $HOST1 $@" } diff --git a/test/140_ipam_expose_test.sh b/test/140_ipam_expose_test.sh index a1176068..11b40994 100755 --- a/test/140_ipam_expose_test.sh +++ b/test/140_ipam_expose_test.sh @@ -6,8 +6,6 @@ R1=10.2.1.0/24 C3=10.2.2.34 C4=10.2.2.37 -PING="ping -nq -W 1 -c 1" - weave_on1() { assert_raises "weave_on $HOST1 $@" } diff --git a/test/config.sh b/test/config.sh index 1646c6d5..547bedd7 100644 --- a/test/config.sh +++ b/test/config.sh @@ -29,6 +29,8 @@ HOST2=$(echo $HOSTS | cut -f 2 -d ' ') SSH=${SSH:-ssh -l vagrant -i ./insecure_private_key -o UserKnownHostsFile=./.ssh_known_hosts -o CheckHostIP=no -o StrictHostKeyChecking=no} +PING="ping -nq -W 1 -c 1" + remote() { rem=$1 shift 1 diff --git a/test/sanity_check.sh b/test/sanity_check.sh index ed633070..a003f570 100755 --- a/test/sanity_check.sh +++ b/test/sanity_check.sh @@ -5,8 +5,8 @@ set -e whitely echo Ping each host from the other -run_on $HOST2 ping -q -c 4 $HOST1 -run_on $HOST1 ping -q -c 4 $HOST2 +run_on $HOST2 $PING $HOST1 +run_on $HOST1 $PING $HOST2 whitely echo Check we can reach docker docker_on $HOST1 info