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

[exim.git] / test / stderr / 5005

diff --git a/test/stderr/5005 b/test/stderr/5005
index 4e2a84b59f59276dd5d816350a9a0a385b2cc324..a471ce79a8cc500cd3984d88b9ab31d04ec1e5fd 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
@@ -136,7 +136,7 @@ delivering in maildir format in TESTSUITE/test-mail/nofile
 writing to tmp/MAILDIR.myhost.test.ex
 Exim quota = 500 old size = sssss this message = sss (included)
   file count quota = 0 count = 0
-writing data block fd=8 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 added 'ddd 1' to maildirsize file
 renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
@@ -188,9 +188,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
@@ -304,7 +304,7 @@ delivering in maildir format in TESTSUITE/test-mail/userx
 writing to tmp/MAILDIR.myhost.test.ex
 Exim quota = 500 old size = sssss this message = sss (included)
   file count quota = 0 count = 0
-writing data block fd=8 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 added 'ddd 1' to maildirsize file
 renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
@@ -356,9 +356,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line
@@ -535,9 +535,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line
@@ -583,6 +583,7 @@ Considering: userx@test.ex
 unique = userx@test.ex
 dbfn_read: key=R:test.ex
 dbfn_read: key=R:userx@test.ex
+dbfn_read: key=R:userx@test.ex:<CALLER@test.ex>
 no domain retry record
 no address retry record
 userx@test.ex: queued for routing