From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 8 Mar 2020 18:37:14 +0000 (+0000)
Subject: Testsuite: better restriction of parallel 2-stage-queue-runners
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/ecf0514306dd9c0baf94c43932cf77bd25fd8df0?hp=305e4faec28e5e0eb990009f720aef91c1ecba92

Testsuite: better restriction of parallel 2-stage-queue-runners
---

diff --git a/src/src/queue.c b/src/src/queue.c
index 8c9f5cb2a..53dc6e026 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -483,10 +483,11 @@ for (int i = queue_run_in_order ? -1 : 0;
       int i;
       if (qpid[f.running_in_test_harness ? 0 : nelem(qpid) - 1])
 	{
-	DEBUG(D_queue_run) debug_printf("q2stage waiting for child\n");
+	DEBUG(D_queue_run) debug_printf("q2stage waiting for child %d\n", (int)qpid[0]);
 	waitpid(qpid[0], NULL, 0);
 	DEBUG(D_queue_run) debug_printf("q2stage reaped child %d\n", (int)qpid[0]);
-	for (i = 0; i < nelem(qpid) - 1; i++) qpid[i] = qpid[i+1];
+	if (f.running_in_test_harness) i = 0;
+	else for (i = 0; i < nelem(qpid) - 1; i++) qpid[i] = qpid[i+1];
 	qpid[i] = 0;
 	}
       else
diff --git a/test/scripts/0999-EXP-Queue-Ramp/0999 b/test/scripts/0999-EXP-Queue-Ramp/0999
index fd552158b..dc60dfa6a 100644
--- a/test/scripts/0999-EXP-Queue-Ramp/0999
+++ b/test/scripts/0999-EXP-Queue-Ramp/0999
@@ -675,7 +675,7 @@ killdaemon
 # Only check that we logged the right number of messages; don't care
 # about ordering or mistakes in wrong message-id
 sudo perl
-system "egrep -v '(Completed|<=|=>)' DIR/spool/log/mainlog 1>&2";
+system "egrep -v '(Completed|<=|=>|is locked)' DIR/spool/log/mainlog 1>&2";
 system "wc -l DIR/test-stdout 1>&2";
 system "grep -q '=>' DIR/spool/log/servermainlog && echo 'daemon did make at least one delivery' 1>&2";
 ****