Retry: always use interface, if set, for retry DB key. Bug 1678

[exim.git] / test / scripts / 0000-Basic / 0568

diff --git a/test/scripts/0000-Basic/0568 b/test/scripts/0000-Basic/0568
index 2aa86f45d226e39abe75ee047c2c046147da16f7..a660f680533738d5389167fb623b9af3e2eab6ff 100644 (file)
--- a/test/scripts/0000-Basic/0568
+++ b/test/scripts/0000-Basic/0568
@@ -1,76 +1,38 @@
-# Recipient callout with AUTH
-need_ipv4
-#
-# Variant 1: using authenticated_sender on the transport.
-server PORT_S 1
-220 Welcome
-EHLO
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH
-250 Oh alright then
-MAIL FROM
-250 OK
-RCPT TO
-250 OK
-QUIT
-250 OK
-****
-exim -odq -bs
-EHLO the.client
-mail from:<>
-RCPT TO:<abc@force> 
-quit
-****
+# ACL regex= test

 #
 #

+# These tests are copies from testcase 4000;
+# they should be removed from there but I don't
+# run spamassassin so can't verify the change.

 #
 #

-# Variant 2: Passing through an authenticated_sender from the MAIL FROM:
-server PORT_S 1
-220 Welcome
-EHLO
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH
-250 Oh alright then
-MAIL FROM
-250 OK
-RCPT TO
-250 OK
-QUIT
-250 OK
-****
-exim -odq -bs
-EHLO the.client
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-mail from:<> AUTH=freddy
-RCPT TO:<abc@normal> 
+exim -odi -bs
+ehlo test.ex
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+From: Test person <tp@cam.ac.uk>
+To: Me <userx@test.ex>
+Subject: A real test message
+Date: Fri, 17 Dec 2004 16:13:04 +0100
+Message-ID: <41C2F849.3060203@projectile.test.ex>
+
+OK, this should look like a genuine message.
+.

 quit
 ****
 quit
 ****

-#
-#
-# Variant 3: An authenticated_sender option on the transport should override
-# a value set by the MAIL FROM:
-server PORT_S 1
-220 Welcome
-EHLO
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH
-250 Oh alright then
-MAIL FROM
-250 OK
-RCPT TO
-250 OK
-QUIT
-250 OK
-****
-exim -odq -bs
-EHLO the.client
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-mail from:<> AUTH=freddy
-RCPT TO:<def@force> 
+exim -odi -bs
+ehlo test.ex
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+From: Test person <tp@cam.ac.uk>
+To: Me <userx@test.ex>
+Subject: A real test message
+Date: Fri, 17 Dec 2004 16:13:04 +0100
+Message-ID: <41C2F849.3060203@projectile.test.ex>
+FakeReject: test fakereject
+
+OK, this should look like a genuine message, but
+it will trip on THIS gazornenplaz REGEX.
+.

 quit
 ****
 quit
 ****