X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ff9663026d1a318d385730c4a2c3e85508b4b00b..ae0a8c3a7e15ddec563e2eaef130d96bb3f7b2a8:/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 fd552158b..3fb8df90d 100644 --- a/test/scripts/0999-EXP-Queue-Ramp/0999 +++ b/test/scripts/0999-EXP-Queue-Ramp/0999 @@ -15,6 +15,7 @@ exim -DSERVER=server -bd -q30m -odd -oX PORT_D **** # exim -bs +helo test mail from:ralph@dustyshoes.tld rcpt to:bob@anotherone.tld data @@ -671,14 +672,18 @@ 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|<=|=>)' 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 +sudo rm -f DIR/spool/log/mainlog DIR/spool/log/servermainlog no_stdout_check no_msglog_check