Testsuite: TLS server testcase consolidation

[users/heiko/exim.git] / test / rejectlog / 0583

diff --git a/test/rejectlog/0583 b/test/rejectlog/0583
index 993bc4559446737886b5fa39babe4f99a80ac1a9..432b6780ff7a1caa54924c769d24b55faf1f1693 100644 (file)
--- a/test/rejectlog/0583
+++ b/test/rejectlog/0583
@@ -1,36 +1,6 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
-Envelope-from: <CALLER@myhost.test.ex>
-Envelope-to: <userx@dom.com>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
-       (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaX-0005vi-00
-       for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
-T To: b@b.c, himself <usery@dom.com>
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
-Envelope-from: <CALLER@myhost.test.ex>
-Envelope-to: <userx@dom.com>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
-       (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaY-0005vi-00
-       for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
-T To: c@b.c, himself <usery@dom.com>
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
-Envelope-from: <CALLER@myhost.test.ex>
-Envelope-to: <userx@dom.com>
-    <usery@dom.com>
-    <userz@dom.com>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
-       (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-T To: e@b.c, himself <UserY@dom.com>
-* Cc: unqualified, UserX@dom.com, x@y.z
-C Cc: unqualified@myhost.test.ex, UserX@dom.com, x@y.z
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+******** SERVER ********
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<b@test.ex> rejected RCPT <quota_fail@test.ex>: Over quota
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<c@test.ex> rejected RCPT <route_fail@test.ex>: Unrouteable address
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<e@test.ex> rejected RCPT <quota_fail@test.ex>: Previous (cached) quota verification failure
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<f@test.ex> rejected RCPT <route_fail@test.ex>: Unrouteable address