Testsuite: tidy retry-db testcase

[users/jgh/exim.git] / test / scripts / 4000-scanning / 4009

diff --git a/test/scripts/4000-scanning/4009 b/test/scripts/4000-scanning/4009
index 4c2ab81c6498bf6d74d765cddcead7db34b0f234..50f5ff990afbfff086670f6ae720f3b1e01a2df4 100644 (file)
--- a/test/scripts/4000-scanning/4009
+++ b/test/scripts/4000-scanning/4009
@@ -105,7 +105,7 @@ server 7833
 >
 *eof
 ****
 >
 *eof
 ****

-exim -odi -bs -DOPT='retry=10s'
+exim -odi -bs -DOPT='127.0.0.1 7833 retry=10s'

 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>


@@ -163,7 +163,66 @@ server -i 2 7833
 >
 *eof
 ****
 >
 *eof
 ****

-exim -odi -bs -DOPT='retry=4s'
+exim -odi -bs -DOPT='127.0.0.1 7833 retry=4s'
+ehlo test.ex
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+Content-type: text/plain
+
+test
+.
+quit
+****
+#
+#
+#
+# Multiple servers, prioritised, with timeout spec; first one fails
+# List separator changed
+server 7833
+<REPORT SPAMC
+<User:
+<Content-length:
+<
+<From 
+<X-Envelope-From
+<X-Envelope-To
+<Received: 
+<      by 
+<      (envelope
+<      id 
+<      for 
+<Content-type: text/plain
+<Message-Id:
+<From:
+<Date:
+<
+<test
+>SPAMD/1.1 0 EX_OK
+>Spam: False ; 4.5 / 5.0
+>
+>Spam detection software, running on the system "demo",
+>has NOT identified this incoming email as spam.  The original
+>message has been attached to this so you can view it or label
+>similar future email.  If you have any questions, see
+>@@CONTACT_ADDRESS@@ for details.
+>
+>Content preview:  test [...] 
+>
+>Content analysis details:   (4.5 points, 5.0 required)
+>
+> pts rule name              description
+>---- ---------------------- --------------------------------------------------
+>-1.0 ALL_TRUSTED            Passed through trusted hosts only via SMTP
+> 1.2 MISSING_HEADERS        Missing To: header
+> 1.0 MISSING_FROM           Missing From: header
+> 1.8 MISSING_SUBJECT        Missing Subject: header
+> 1.4 MISSING_DATE           Missing Date: header
+> 0.1 MISSING_MID            Missing Message-Id: header
+>
+*eof
+****
+exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s'

 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>