Correct header sorting for testsuite. Required manual patching, so maybe errors...

[users/jgh/exim.git] / test / rejectlog / 0026

diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 384d6ef6e77d5cbc3d5dad34f91e71d71d3a44ab..2d97471f9c8c2f9ccf1496d4c20feef040615f91 100644 (file)
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -5,27 +5,27 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: @
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+F From: @

 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: <x@y>, @
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+F From: <x@y>, @

 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: <x@y>
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+F From: <x@y>

   X-warning: this is a test warning
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>
   X-warning: this is a test warning
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>


@@ -34,6 +34,17 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: x@y
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: x@y

+1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
+Envelope-from: <>
+Envelope-to: <userx@test.ex>
+P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+       id 10HmbB-0005vi-00
+       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+T to: group name: x@y, p@q;
+R reply-to: group name:;
+  X-warning: this is a test warning