X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fscripts%2F0999-EXP-Queue-Ramp%2F0999;h=3fb8df90db36a947d9fd7fca33b56af0361f6695;hb=b634f8eaf52aae84c311d7e306f38f3dc07ff1b0;hp=dc60dfa6ab25c80387f09a74c1038818046126cf;hpb=ecf0514306dd9c0baf94c43932cf77bd25fd8df0;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/scripts/0999-EXP-Queue-Ramp/0999 b/test/scripts/0999-EXP-Queue-Ramp/0999
index dc60dfa6a..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|<=|=>|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
+sudo rm -f DIR/spool/log/mainlog DIR/spool/log/servermainlog
 no_stdout_check
 no_msglog_check