From 91a97a964d4b8793b7304b8851c0ae76bf35da36 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 2 May 2015 17:05:20 +0100
Subject: [PATCH] server/tests.at (AWAIT_KXDONE): More warning suppressions.

Slow hosts (e.g., Scratchbox, under emulation) can trigger warnings in
both directions, and also `unexpected-challenge', depending on how far
the key exchange has progressed by the time the other end gets the
`FORCEKX' command.
---
 server/tests.at | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/tests.at b/server/tests.at
index 18bd54f4..5fcf0601 100644
--- a/server/tests.at
+++ b/server/tests.at
@@ -221,9 +221,12 @@ m4_define([COMMS_SLIP], [
 m4_define([AWAIT_KXDONE], [
 
   ## Ignore some reports caused by races.
-  TRIPECTL -d$3 WARN test PUSH
-  TRIPECTL -d$3 WARN test IGNORE WARN KX $2 incorrect cookie
-  TRIPECTL -d$3 WARN test IGNORE WARN KX $2 unexpected pre-challenge
+  for d in $1 $3; do
+    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
+  done
 
   ## Watch for the key-exchange completion announcement in the background.
   COPROCESSES([wait-$1], [
@@ -249,7 +252,7 @@ m4_define([AWAIT_KXDONE], [
   AT_CHECK([echo $waitrc],, [0[]nl])
 
   ## Be interested in key-exchange warnings again.
-  TRIPECTL -d$3 WARN test POP
+  for d in $1 $3; do TRIPECTL -d$d WARN test POP; done
 ])
 
 ## ESTABLISH(adir, aname, aopts, bdir, bname, bopts, [aport], [bport])
-- 
2.11.0