Unbreak transport-filters & bounce-generation.

[users/jgh/exim.git] / test / stderr / 0317

diff --git a/test/stderr/0317 b/test/stderr/0317
index c0ea3d0b4f9a44a2390ed56c4cd7759ee6111756..5ffdc4a360dccfcfc0fc81e42a1ba3f5514fde28 100644 (file)
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -10,13 +10,14 @@ Cc: a@b.c
 Bcc: p@q.r
 
 >>Headers after rewriting and local additions:
 Bcc: p@q.r
 
 >>Headers after rewriting and local additions:

-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>

 T To: x@y.z
 C Cc: a@b.c
 * Bcc: p@q.r
 T To: x@y.z
 C Cc: a@b.c
 * Bcc: p@q.r

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

 F From: CALLER_NAME <CALLER@test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

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

 
 

+Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D

 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)


@@ -24,7 +25,8 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL

-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H

 Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss


@@ -55,6 +57,7 @@ C Resent-cc: pp@qq.rr
 * Resent-bcc: xx@yy.zz
 F Resent-From: CALLER_NAME <CALLER@test.ex>
 
 * Resent-bcc: xx@yy.zz
 F Resent-From: CALLER_NAME <CALLER@test.ex>
 

+Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D

 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)


@@ -62,7 +65,8 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL

-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H

 Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss