Cutthrough: handle request when a callout-hold is active. Bug 2604

[exim.git] / test / scripts / 0999-EXP-Queue-Ramp / 0999

diff --git a/test/scripts/0999-EXP-Queue-Ramp/0999 b/test/scripts/0999-EXP-Queue-Ramp/0999
index fd552158b5b215760c287bd837c5fa4bfcf654fe..827b7b9c8580fe3d5482948aea2b3d710e608642 100644 (file)
--- a/test/scripts/0999-EXP-Queue-Ramp/0999
+++ b/test/scripts/0999-EXP-Queue-Ramp/0999
@@ -671,13 +671,17 @@ exim -odd -qq
 #
 #
 killdaemon
 #
 #
 killdaemon

+sleep 1

 #
 # Only check that we logged the right number of messages; don't care
 # about ordering or mistakes in wrong message-id
 sudo perl
 #
 # 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 "wc -l DIR/test-stdout 1>&2";
-system "grep -q '=>' DIR/spool/log/servermainlog && echo 'daemon did make at least one delivery' 1>&2";
+system "egrep -v '(Completed|<=|=>|is locked)' DIR/spool/log/mainlog 1>&2";
+system "awk '/OK id=/{i++} END{print i, \"messages in\"}' DIR/test-stdout 1>&2";
+system "grep 'notify' DIR/spool/log/servermainlog 1>&2";
+system "grep -q '=> bob' DIR/spool/log/servermainlog && echo 'daemon did make at least one delivery' 1>&2";
+system "awk '/<=/{i++} END{print i, \"messages received by dest\"}' DIR/spool/log/servermainlog 1>&2";
+system "ls DIR/spool/input 1>&2";

 ****
 sudo rm DIR/spool/log/mainlog DIR/spool/log/servermainlog
 no_stdout_check
 ****
 sudo rm DIR/spool/log/mainlog DIR/spool/log/servermainlog
 no_stdout_check