one ping to rule them all

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

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

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

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 $@"
 }

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 $@"
 }

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

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