DANE: Fix 2 messages from queue case

7 files changed, 15 insertions, 2 deletions

diff --git a/test/stderr/0143 b/test/stderr/0143
index c1b6deb26..e91e97a52 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -47,7 +47,8 @@ writing data block fd=dddd size=sss timeout=300
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
-no messages waiting for 127.0.0.1
+ no messages waiting for 127.0.0.1
+transport_check_waiting: FALSE
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
diff --git a/test/stderr/0476 b/test/stderr/0476
index 69ab06b88..d5c571d9b 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -42,6 +42,7 @@ error for DATA ignored: pipelining is in use and there were no good recipients
 ok=1 send_quit=1 send_rset=1 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
+transport_check_waiting: TRUE
   SMTP>> RSET
 cmd buf flush ddd bytes
   SMTP(closed)<<
diff --git a/test/stderr/2013 b/test/stderr/2013
index f3c5421e3..682b53efc 100644
--- a/test/stderr/2013
+++ b/test/stderr/2013
@@ -45,6 +45,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+Transport port=1225 replaced by host-specific port=1225
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userz@test.ex>
   SMTP>> DATA
@@ -64,6 +65,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+Transport port=1225 replaced by host-specific port=1225
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<usery@test.ex>
   SMTP>> DATA
@@ -131,6 +133,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+Transport port=1225 replaced by host-specific port=1225
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userc@test.ex>
   SMTP>> DATA
@@ -150,6 +153,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+Transport port=1225 replaced by host-specific port=1225
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userb@test.ex>
   SMTP>> DATA
diff --git a/test/stderr/2035 b/test/stderr/2035
index 70759060f..7187d0d3e 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -54,6 +54,7 @@ checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex)
 Transport port=25 replaced by host-specific port=1225
+Transport port=25 replaced by host-specific port=1225
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes
diff --git a/test/stderr/2113 b/test/stderr/2113
index 9541b65a2..6ccdea8c7 100644
--- a/test/stderr/2113
+++ b/test/stderr/2113
@@ -45,6 +45,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+Transport port=1225 replaced by host-specific port=1225
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userz@test.ex>
   SMTP>> DATA
@@ -64,6 +65,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+Transport port=1225 replaced by host-specific port=1225
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<usery@test.ex>
   SMTP>> DATA
@@ -131,6 +133,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+Transport port=1225 replaced by host-specific port=1225
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userc@test.ex>
   SMTP>> DATA
@@ -150,6 +153,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+Transport port=1225 replaced by host-specific port=1225
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userb@test.ex>
   SMTP>> DATA
diff --git a/test/stderr/2135 b/test/stderr/2135
index 70759060f..7187d0d3e 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -54,6 +54,7 @@ checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex)
 Transport port=25 replaced by host-specific port=1225
+Transport port=25 replaced by host-specific port=1225
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes
diff --git a/test/stderr/4052 b/test/stderr/4052
index cf06d963f..53b9e0ae0 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -54,7 +54,8 @@ writing data block fd=dddd size=sss timeout=300
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
-no messages waiting for 127.0.0.1
+ no messages waiting for 127.0.0.1
+transport_check_waiting: FALSE
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>