X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Fns-ping.test;h=bb76ed392e7ad95ff7a7b7298c566699e02bbf67;hb=7e09765003114ba37fed2851d9126924d0f813f1;hp=43e1b20c8af861e3b3d33e1cafc2ec1ff0305a7a;hpb=ccb4fb6f7ac2efbb99d044aa072e75c035f504aa;p=tinc

diff --git a/test/ns-ping.test b/test/ns-ping.test
index 43e1b20c..bb76ed39 100755
--- a/test/ns-ping.test
+++ b/test/ns-ping.test
@@ -2,69 +2,80 @@
 
 . ./testlib.sh
 
-# Skip this test if we aren't root or if "ip netns" does not exist
+echo "[STEP] Skip this test if we aren't root or if 'ip netns' does not exist"
 
-test "`id -u`" = "0" || exit 77
-ip netns list || exit 77
+test "$(id -u)" = "0" || exit $EXIT_SKIP_TEST
+test -e /dev/net/tun || exit $EXIT_SKIP_TEST
+ip netns list || exit $EXIT_SKIP_TEST
 
-# Initialize two nodes
+ip_foo=192.168.1.1
+ip_bar=192.168.1.2
+mask=24
 
-$tinc $c1 <<EOF
+echo [STEP] Create network namespaces
+
+ip netns add ping.test1
+ip netns add ping.test2
+
+cleanup_hook() {
+  ip netns del ping.test1
+  ip netns del ping.test2
+}
+
+echo [STEP] Initialize two nodes
+
+tinc foo <<EOF
 init foo
-set Mode switch
+set Subnet $ip_foo
 set Interface ping.test1
-set Port 32577
+set Port 30090
 set Address localhost
+set AutoConnect no
 EOF
 
-cat >$d1/tinc-up <<EOF
-#!/bin/sh
-ip netns add ping.test1
-ip link set dev \$INTERFACE netns ping.test1
-ip netns exec ping.test1 ip addr add 192.168.1.1/24 dev \$INTERFACE
-ip netns exec ping.test1 ip link set \$INTERFACE up
-EOF
+# shellcheck disable=SC2016
+create_script foo tinc-up "
+  ip link set dev \$INTERFACE netns ping.test1
+  ip netns exec ping.test1 ip addr add $ip_foo/$mask dev \$INTERFACE
+  ip netns exec ping.test1 ip link set \$INTERFACE up
+"
 
-$tinc $c2 <<EOF
+tinc bar <<EOF
 init bar
-set Mode switch
+set Subnet $ip_bar
 set Interface ping.test2
-set Port 32574
-EOF
-
-cat >$d2/tinc-up <<EOF
-#!/bin/sh
-ip netns add ping.test2
-ip link set dev \$INTERFACE netns ping.test2
-ip netns exec ping.test2 ip addr add 192.168.1.2/24 dev \$INTERFACE
-ip netns exec ping.test2 ip link set \$INTERFACE up
+set Port 30091
+set AutoConnect no
 EOF
 
-# Exchange configuration files
+# shellcheck disable=SC2016
+create_script bar tinc-up "
+  ip link set dev \$INTERFACE netns ping.test2
+  ip netns exec ping.test2 ip addr add $ip_bar/$mask dev \$INTERFACE
+  ip netns exec ping.test2 ip link set \$INTERFACE up
+"
 
-$tinc $c1 export | $tinc $c2 exchange | $tinc $c1 import
+echo [STEP] Exchange configuration files
 
-# Start tinc
+tinc foo export | tinc bar exchange | tinc foo import
 
-$tinc $c1 start $r1
-$tinc $c2 start $r2
+echo [STEP] Start tinc
 
-sleep 1
+start_tinc foo
+start_tinc bar
 
-# The nodes should not be able to ping each other if there is no connection
+wait_script foo tinc-up
+wait_script bar tinc-up
 
-ip netns exec ping.test1 ping -W1 -c3 192.168.1.2 && exit 1
+echo [STEP] The nodes should not be able to ping each other if there is no connection
 
-# After connecting they should be
+must_fail ip netns exec ping.test1 ping -W1 -c3 $ip_bar
 
-$tinc $c2 add ConnectTo foo
-sleep 1
+echo [STEP] After connecting they should be
 
-ip netns exec ping.test1 ping -W1 -c3 192.168.1.2
+create_script bar hosts/foo-up
 
-# Clean up
+tinc bar add ConnectTo foo
+wait_script bar hosts/foo-up
 
-$tinc $c2 stop
-$tinc $c1 stop
-ip netns del ping.test2
-ip netns del ping.test1
+ip netns exec ping.test1 ping -W1 -c3 $ip_bar