> $1/expected-server-output
> $1/expected-server-errors
-## Keep Autotest writes crap to standard output, which we don't want going to
-## the server. So keep a copy of the standard output, do the pipe, and
-## recover the old stdout inside the group.
+## Autotest writes crap to standard output, which we don't want going to the
+## server. So keep a copy of the standard output, do the pipe, and recover
+## the old stdout inside the group.
exec 3>&1
{ (
exec 1>&3 3>&-
## Wait for the socket to appear. Watch for the server crashing during
## initialization. Busy waiting is evil, but it's the best I can do and
## not sleep for ages. (Yes, a second on each test group is a long time.)
-while test ! -r $1//server-status && test ! -S $1/admin; do :; done
+while test ! -r $1/server-status && test ! -S $1/admin; do :; done
## Test body...
$3
## TRIPECTL_INTERACT(ARGS, SHELLSTUFF)
m4_define([TRIPECTL_INTERACT], [
- exec 3<&1
- COPROCESSES([client], [exec 4>&1 1>&3 $2], [TRIPECTL $1])
+ exec 3>&1
+ COPROCESSES([client], [exec 4>&1 1>&3 $1], [TRIPECTL $2])
])
## TRIPECTL_COMMAND(CMD, EXPECT)
AT_CHECK([TRIPECTL -dalice ADD bob INET 127.0.0.1 $(cat bob/port)])
echo >>bob/expected-server-output \
"WARN PEER - unexpected-source INET 127.0.0.1 $(cat alice/port)"
- AT_CHECK([TRIPECTL -dbob ADD alice INET 127.0.0.1 $(cat alice/port)])
+ AT_CHECK([TRIPECTL -dbob ADD -key alice not-alice \
+ INET 127.0.0.1 $(cat alice/port)])
## Check transport pinging.
AT_CHECK([TRIPECTL -dalice PING bob],, [ignore])
- AT_CHECK([TRIPECTL -dbob PING alice],, [ignore])
+ AT_CHECK([TRIPECTL -dbob PING not-alice],, [ignore])
## Wait for the completion announcement.
wait
## Check encrypted pinging.
AT_CHECK([TRIPECTL -dalice EPING bob],, [ignore])
- AT_CHECK([TRIPECTL -dbob EPING alice],, [ignore])
+ AT_CHECK([TRIPECTL -dbob EPING not-alice],, [ignore])
## Check that packets can flow from one to the other.
AT_CHECK([echo "from alice" | USLIP -p alice/bob])
- AT_CHECK([USLIP -g bob/alice],, [from alice[]nl])
+ AT_CHECK([USLIP -g bob/not-alice],, [from alice[]nl])
- AT_CHECK([echo "from bob" | USLIP -p bob/alice])
+ AT_CHECK([echo "from bob" | USLIP -p bob/not-alice])
AT_CHECK([USLIP -g alice/bob],, [from bob[]nl])
])