From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 11 Nov 2018 18:30:22 +0000 (+0000)
Subject: Testsuite: account for hostname-dependent output in debug output
X-Git-Tag: exim-4.92-RC1~34
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fc1c08204f41dc2ac4200677c2c60c6fe6c5c3b7;p=exim.git

Testsuite: account for hostname-dependent output in debug output
---

diff --git a/test/runtest b/test/runtest
index f90643ca6..62d49adf3 100755
--- a/test/runtest
+++ b/test/runtest
@@ -476,7 +476,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   # more_errno values in exim_dumpdb output which are times
   s/T:(\S+)\s-22\s(\S+)\s/T:$1 -22 xxxx /;
 
-  # port numbers
+  # port numbers in dumpdb output
   s/T:([a-z.]+(:[0-9.]+)?):$parm_port_n /T:$1:PORT_N /;
 
 
@@ -1166,8 +1166,8 @@ RESET_AFTER_EXTRA_LINE_READ:
       s/Address family not supported by protocol family/Network Error/;
       s/Network is unreachable/Network Error/;
       }
-
     next if /^(ppppp )?setsockopt FASTOPEN: Protocol not available$/;
+    s/^(Connecting to .* \.\.\. sending) \d+ (nonTFO early-data)$/$1 dd $2/;
 
     # Specific pointer values reported for DB operations change from run to run
     s/^(\s*returned from EXIM_DBOPEN: )(0x)?[0-9a-f]+/${1}0xAAAAAAAA/;
diff --git a/test/stderr/4052 b/test/stderr/4052
index 35739f170..64f8b9e21 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -28,7 +28,7 @@ not using DSN
   SMTP>> RCPT TO:<extchange@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... sending 87 nonTFO early-data
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... sending dd nonTFO early-data
 connected
 smtp_reap_early_pipe expect banner
   SMTP<< 220 banner