X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/ee07712cb7eb8f692976a5dcca97e8f138b5cfb5..918a33b717db3df1caca4ef58bc891cbd10966da:/server/tests.at?ds=sidebyside

diff --git a/server/tests.at b/server/tests.at
index 303c3464..f47aae48 100644
--- a/server/tests.at
+++ b/server/tests.at
@@ -229,11 +229,12 @@ m4_define([COMMS_SLIP], [
 m4_define([AWAIT_KXDONE], [
 
   ## Ignore some reports caused by races.
-  for d in $1 $3; do
+  for i in $1!$4 $3!$2; do
+    d=${i%!*} o=${i#*!}
     TRIPECTL -d$d WARN test PUSH
-    TRIPECTL -d$d WARN test IGNORE WARN KX $2 incorrect cookie
-    TRIPECTL -d$d WARN test IGNORE WARN KX $2 unexpected pre-challenge
-    TRIPECTL -d$d WARN test IGNORE WARN KX $2 unexpected challenge
+    TRIPECTL -d$d WARN test IGNORE WARN KX $o incorrect cookie
+    TRIPECTL -d$d WARN test IGNORE WARN KX $o unexpected pre-challenge
+    TRIPECTL -d$d WARN test IGNORE WARN KX $o unexpected challenge
   done
 
   ## Watch for the key-exchange completion announcement in the background.
@@ -245,7 +246,7 @@ m4_define([AWAIT_KXDONE], [
       case "$[]1:$[]2:$[]3" in
 	OK::) ;;
 	NOTE:KXDONE:$4) break ;;
-	NOTE:*) ;;
+	NOTE:* | TRACE:* | WARN:*) ;;
 	*) exit 63 ;;
       esac
     done