From add23883a6378567be6b7866bc2ff2c32400a346 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Fri, 19 Feb 2016 21:49:33 +0000 Subject: [PATCH] server/tests.at (AWAIT_KXDONE): Ignore the correct server messages. Organization: Straylight/Edgeware From: Mark Wooding The old code told arranged for both peers to ignore complains about unexpected packets from the /first/ peer, with the predictable result that the first peer complains about unexpected packets from the second and the test fails spuriously. --- server/tests.at | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/tests.at b/server/tests.at index 303c3464..2d22c574 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. -- [mdw]