[exim-cvs] Testsuite: when generating a bounce message, all…

Gitweb: https://git.exim.org/exim.git/commitdiff/73141a5abf8a3699249e401522fe9174b5aa8a1b

Commit:     73141a5abf8a3699249e401522fe9174b5aa8a1b
Parent:     be839a2609381f535f263ed0c459a4ebf3fd5d1d
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Feb 13 20:31:44 2021 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Feb 13 21:34:20 2021 +0000

    Testsuite: when generating a bounce message, allow time for exec to run before before feeding the message

    This is to keep debug output in similar order on different platforms
---
 src/src/child.c  | 2 ++
 test/stderr/0476 | 4 ++--
 test/stderr/0512 | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/src/child.c b/src/src/child.c
index 1407b37..948e0d6 100644
--- a/src/src/child.c
+++ b/src/src/child.c
@@ -269,6 +269,8 @@ if (pid == 0)
     }
   }

+testharness_pause_ms(100); /* let child work even longer, for exec */
+
/* Parent process. Save fork() errno and close the reading end of the stdin
pipe. */

diff --git a/test/stderr/0476 b/test/stderr/0476
index 391c13b..52fe40a 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -57,13 +57,13 @@ set_process_info: pppp delivering 10HmaX-0005vi-00
LOG: MAIN
** userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 NO
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
set_process_info: pppp accepting a local non-SMTP message from <>
+cannot use sendfile for body: spoolfile not wireformat
+writing data block fd=dddd size=sss timeout=0
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
diff --git a/test/stderr/0512 b/test/stderr/0512
index aad4862..56971b6 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -61,12 +61,12 @@ LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
** userx@???: retry timeout exceeded
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+cannot use sendfile for body: spoolfile not wireformat
+writing data block fd=dddd size=sss timeout=0
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
@@ -129,12 +129,12 @@ LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
** userx@???: retry timeout exceeded
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+cannot use sendfile for body: spoolfile not wireformat
+writing data block fd=dddd size=sss timeout=0
LOG: MAIN
<= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....