server/tests.at (AWAIT_KXDONE): Ignore the correct server messages.

[tripe] / server / tests.at

diff --git a/server/tests.at b/server/tests.at
index 303c3464a18039e4c4495264cf9a231d750f5e91..2d22c574564b766a4308e69a61b455865b91032e 100644 (file)
--- 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.
 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 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.
   done
 
   ## Watch for the key-exchange completion announcement in the background.