From 73141a5abf8a3699249e401522fe9174b5aa8a1b Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 13 Feb 2021 20:31:44 +0000 Subject: [PATCH] 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 1407b3718..948e0d669 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 391c13b59..52fe40ae8 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -57,13 +57,13 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 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 aad486280..56971b680 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -61,12 +61,12 @@ LOG: MAIN == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused LOG: MAIN ** userx@myhost.test.ex: 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@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused LOG: MAIN ** userx@myhost.test.ex: 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 .... -- 2.30.2