projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify signal handling.
[tinc]
/
test
/
invite-join.test
diff --git
a/test/invite-join.test
b/test/invite-join.test
index
c1bd1b8
..
7915581
100755
(executable)
--- a/
test/invite-join.test
+++ b/
test/invite-join.test
@@
-2,48
+2,49
@@
. ./testlib.sh
. ./testlib.sh
-
#
Initialize one node
+
echo [STEP]
Initialize one node
-
$tinc $c1
<<EOF
+
tinc foo
<<EOF
init foo
set DeviceType dummy
set Mode switch
set Broadcast no
init foo
set DeviceType dummy
set Mode switch
set Broadcast no
-del Port
set Address localhost
set Address localhost
-set Port 32751
-start $r1
+set Port 30010
EOF
EOF
-# Generate an invitation and let another node join the VPN
+start_tinc foo
-sleep 1
+echo [STEP] Generate an invitation and let another node join the VPN
-$tinc $c1 invite bar | $tinc $c2 join
+invitation=$(tinc foo invite bar)
+tinc bar join "$invitation"
-
#
Test equivalence of host config files
+
echo [STEP]
Test equivalence of host config files
-cmp $d1/hosts/foo $d2/hosts/foo
-test "
`grep ^Ed25519PublicKey $d1/hosts/bar`" = "`grep ^Ed25519PublicKey $d2/hosts/bar`
"
+diff -w "$DIR_FOO/hosts/foo" "$DIR_BAR/hosts/foo"
+test "
$(grep ^Ed25519PublicKey "$DIR_FOO/hosts/bar")" = "$(grep ^Ed25519PublicKey "$DIR_BAR/hosts/bar")
"
-
#
Test Mode, Broadcast and ConnectTo statements
+
echo [STEP]
Test Mode, Broadcast and ConnectTo statements
-test
`$tinc $c2 get Mode`
= switch
-test
`$tinc $c2 get Broadcast`
= no
-test
`$tinc $c2 get ConnectTo`
= foo
+test
"$(tinc bar get Mode)"
= switch
+test
"$(tinc bar get Broadcast)"
= no
+test
"$(tinc bar get ConnectTo)"
= foo
-
#
Check whether the new node can join the VPN
+
echo [STEP]
Check whether the new node can join the VPN
-
$tinc $c2 <<
EOF
+
tinc bar <<
EOF
set DeviceType dummy
set Port 0
set DeviceType dummy
set Port 0
-start $r2
EOF
EOF
-sleep 1
+create_script foo hosts/bar-up
+create_script bar hosts/foo-up
-test `$tinc $c1 dump reachable nodes | wc -l` = 2
-test `$tinc $c2 dump reachable nodes | wc -l` = 2
+start_tinc bar
-$tinc $c2 stop
-$tinc $c1 stop
+wait_script foo hosts/bar-up
+wait_script bar hosts/foo-up
+
+require_nodes foo 2
+require_nodes bar 2