Split long fakereject and fakedefer messages.

5 files changed, 69 insertions, 2 deletions

diff --git a/test/confs/0555 b/test/confs/0555
new file mode 100644
index 000000000..07b3a59ca
--- /dev/null
+++ b/test/confs/0555
@@ -0,0 +1,28 @@
+# Exim test configuration 0555
+
+FAKE=fakereject
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = check_rcpt
+queue_only
+
+
+# ----- ACLs -----
+
+begin acl
+
+check_rcpt:
+  accept  control = FAKE
+
+
+# End
diff --git a/test/log/0555 b/test/log/0555
new file mode 100644
index 000000000..e223bd466
--- /dev/null
+++ b/test/log/0555
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
diff --git a/test/scripts/0000-Basic/0555 b/test/scripts/0000-Basic/0555
new file mode 100644
index 000000000..947f1692d
--- /dev/null
+++ b/test/scripts/0000-Basic/0555
@@ -0,0 +1,20 @@
+# Long lines for fakedefer/fakereject
+exim -bs
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+Message 1
+.
+quit
+****
+exim -bs -DFAKE='fakedefer/This is a rather long customised message that \
+                 should get automatically split up into more than one \
+                 response line.' 
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+Message 2
+.
+quit
+****
+no_msglog_check
diff --git a/test/stdout/0555 b/test/stdout/0555
new file mode 100644
index 000000000..b821e7b4b
--- /dev/null
+++ b/test/stdout/0555
@@ -0,0 +1,15 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+550-Your message has been rejected but is being kept for evaluation.

+550-If it was a legitimate message, it may still be delivered to the target

+550 recipient(s).

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+450-This is a rather long customised message that should get automatically

+450 split up into more than one response line.

+221 myhost.test.ex closing connection

diff --git a/test/stdout/4000 b/test/stdout/4000
index b9562b619..819f449ef 100644
--- a/test/stdout/4000
+++ b/test/stdout/4000
@@ -37,7 +37,8 @@
 250 Accepted

 354 Enter message, ending with "." on a line by itself

 550-Your message has been rejected but is being kept for evaluation.

-550 If it was a legitimate message, it may still be delivered to the target recipient(s).

+550-If it was a legitimate message, it may still be delivered to the target

+550 recipient(s).

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250-myhost.test.ex Hello CALLER at test.ex

@@ -58,7 +59,8 @@
 250 Accepted

 354 Enter message, ending with "." on a line by itself

 450-Your message has been rejected but is being kept for evaluation.

-450 If it was a legitimate message, it may still be delivered to the target recipient(s).

+450-If it was a legitimate message, it may still be delivered to the target

+450 recipient(s).

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250 OK