X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ecf0514306dd9c0baf94c43932cf77bd25fd8df0..a368cc11b211657f86f2495002823bc09b71a9f1:/test/scripts/0999-EXP-Queue-Ramp/0999?ds=sidebyside diff --git a/test/scripts/0999-EXP-Queue-Ramp/0999 b/test/scripts/0999-EXP-Queue-Ramp/0999 index dc60dfa6a..827b7b9c8 100644 --- a/test/scripts/0999-EXP-Queue-Ramp/0999 +++ b/test/scripts/0999-EXP-Queue-Ramp/0999 @@ -671,13 +671,17 @@ exim -odd -qq # # 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 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"; +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