From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 13 May 2024 16:21:48 +0000 (+0100)
Subject: Testsuite: more connect-time munge tweaking
X-Git-Tag: exim-4.98-RC0~20
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/b115023ebbd339f31eff6ed67491e562967464d8

Testsuite: more connect-time munge tweaking
---

diff --git a/test/runtest b/test/runtest
index dc777322b..e1ba864f0 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1515,6 +1515,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 	|connection\ attempt\ to\ [^,]+,\ 0\ data)		# MacOS & no-support
 	$/x)
       {
+      $_ = <IN>;
       if (/^connected$/)
 	{
 	$_ .= <IN>;
diff --git a/test/stderr/0227 b/test/stderr/0227
index 456e7717d..87667b9f1 100644
--- a/test/stderr/0227
+++ b/test/stderr/0227
@@ -385,7 +385,6 @@ LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> LHLO myhost.test.ex
diff --git a/test/stderr/0623 b/test/stderr/0623
index b4f564af9..44152a48e 100644
--- a/test/stderr/0623
+++ b/test/stderr/0623
@@ -18,7 +18,6 @@ checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -86,7 +85,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbA-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -154,7 +152,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbB-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
diff --git a/test/stderr/0909 b/test/stderr/0909
index c21b34b85..3093c24ef 100644
--- a/test/stderr/0909
+++ b/test/stderr/0909
@@ -22,7 +22,6 @@ checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (good@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -90,7 +89,6 @@ checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaY-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (nopipe@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -157,7 +155,6 @@ checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -229,7 +226,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbA-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -301,7 +297,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbB-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (dataloss@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
diff --git a/test/stderr/2035 b/test/stderr/2035
index dc1953094..98817e639 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -4,7 +4,6 @@ admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- TFO mode sendto, no data: EINPROGRESS
 connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex