X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/a23e71839a8b7caff67b837245236882cc4a23b4..HEAD:/server/tests.at

diff --git a/server/tests.at b/server/tests.at
index a86c179b..ef2039ae 100644
--- a/server/tests.at
+++ b/server/tests.at
@@ -112,7 +112,7 @@ $3
 ## End of the test, now run the server.
 ) && :; } | {
   cd $1
-  echo TRIPE $2 >&2
+  echo "TRIPE $2" >&2
   WITH_STRACE([tripe], [TRIPE $2 >server-output.full 2>server-errors.full])
   stat=$?
   echo $stat >server-status
@@ -242,7 +242,7 @@ m4_define([AWAIT_KXDONE], [
 
   ## Watch for the key-exchange completion announcement in the background.
   COPROCESSES([wait-$1], [
-    echo WATCH +n
+    echo "WATCH +n"
     while read line; do
       set x $line; shift
       echo >&2 ">>> $line"
@@ -320,7 +320,7 @@ m4_define([TRIPECTL_COMMAND], [
 
 AT_SETUP([server basics])
 SETUPDIR([alpha])
-AT_CHECK([echo port | TRIPE -p54321],, [INFO 54321[]nl[]OK[]nl])
+AT_CHECK([echo "port" | TRIPE -p54321],, [INFO 54321[]nl[]OK[]nl])
 AT_CLEANUP
 
 ###--------------------------------------------------------------------------
@@ -338,7 +338,7 @@ WITH_TRIPE(, [
   ## server chose the same key is negligible.)
   AT_CHECK([TRIPECTL checkchal AAAAAHyoOL+HMaE0Y9B3ivuszt0], [1],,
 	   [tripectl: invalid-challenge[]nl])
-  echo WARN CHAL incorrect-tag >>expected-server-output
+  echo "WARN CHAL incorrect-tag" >>expected-server-output
 
   ## A duplicated challenge.
   AT_CHECK([
@@ -346,7 +346,7 @@ WITH_TRIPE(, [
     TRIPECTL CHECKCHAL $chal
     TRIPECTL CHECKCHAL $chal
   ], [1],, [tripectl: invalid-challenge[]nl])
-  echo WARN CHAL replay duplicated-sequence >>expected-server-output
+  echo "WARN CHAL replay duplicated-sequence" >>expected-server-output
 
   ## Out-of-order reception.  There should be a window of 32 challenges; we
   ## make 33 and check them in a strange order.
@@ -672,7 +672,7 @@ WITH_TRIPE(, [
   ## Run a simple service.
   rm -f svc-test-running tripectl-status
   COPROCESSES([svc], [
-    echo SVCCLAIM test 1.0.0
+    echo "SVCCLAIM test 1.0.0"
     read line
     case "$line" in
       OK)
@@ -682,19 +682,19 @@ WITH_TRIPE(, [
 	exit 1
 	;;
     esac
-    echo ok >svc-test-running
+    echo "ok" >svc-test-running
     while read line; do
       set -- $line
       case "$[]1,$[]3,$[]4" in
 	SVCJOB,test,HELP)
-	  echo SVCINFO try not to use this service for anything useful
-	  echo SVCOK $[]2
+	  echo "SVCINFO try not to use this service for anything useful"
+	  echo "SVCOK $[]2"
 	  ;;
 	SVCJOB,test,GOOD)
-	  echo SVCOK $[]2
+	  echo "SVCOK $[]2"
 	  ;;
 	SVCJOB,test,BAD)
-	  echo SVCFAIL $[]2 this-command-always-fails
+	  echo "SVCFAIL $[]2 this-command-always-fails"
 	  ;;
 	SVCJOB,test,UGLY)
 	  tag=$2
@@ -713,11 +713,11 @@ WITH_TRIPE(, [
 	  firsttag=$[]2
 	  ;;
 	SVCJOB,test,SECOND)
-	  echo SVCOK $firsttag
-	  echo SVCOK $[]2
+	  echo "SVCOK $firsttag"
+	  echo "SVCOK $[]2"
 	  ;;
 	SVCJOB,*)
-	  echo SVCFAIL $[]2 unknown-svc-command $[]4
+	  echo "SVCFAIL $[]2 unknown-svc-command $[]4"
 	  ;;
 	SVCCLAIM,*)
 	  break
@@ -795,7 +795,7 @@ WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [
       TRIPECTL -dalice
     ])& waiter=$!
 
-    AT_CHECK([TRIPECTL -dbob ADD -knock bob alice INET 127.0.0.1 $alice_from_bob])
+    AT_CHECK([TRIPECTL -dbob ADD -knock bob -ephemeral alice INET 127.0.0.1 $alice_from_bob])
 
     wait $waiter; waitrc=$?
     AT_CHECK([echo $waitrc],, [0[]nl])