Fix log line corruption for DKIM status

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

diff --git a/test/stderr/0317 b/test/stderr/0317
index 4a28f262023f7e3b3d71e1f373ff95bf37d3d258..b71581e685bc743e8ed1aa5268d19ca441d7aba3 100644 (file)
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -3,6 +3,8 @@ configuration file is TESTSUITE/test-config
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex

+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 Sender: CALLER@test.ex
 >>Headers received:
 To: x@y.z
 Sender: CALLER@test.ex
 >>Headers received:
 To: x@y.z


@@ -17,6 +19,7 @@ I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 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 +27,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


@@ -35,6 +39,8 @@ configuration file is TESTSUITE/test-config
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex

+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 Sender: CALLER@test.ex
 >>Headers received:
 To: x@y.z
 Sender: CALLER@test.ex
 >>Headers received:
 To: x@y.z


@@ -45,16 +51,17 @@ Resent-cc: pp@qq.rr
 Resent-bcc: xx@yy.zz
 
 >>Headers after rewriting and local additions:
 Resent-bcc: xx@yy.zz
 
 >>Headers after rewriting and local additions:

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

 T To: x@y.z
 C Cc: a@b.c
 B Bcc: p@q.r
 T Resent-to: aa@bb.cc
 C Resent-cc: pp@qq.rr
 * Resent-bcc: xx@yy.zz
 T To: x@y.z
 C Cc: a@b.c
 B Bcc: p@q.r
 T Resent-to: aa@bb.cc
 C Resent-cc: pp@qq.rr
 * Resent-bcc: xx@yy.zz

-I Resent-Message-Id: <E10HmaY-0005vi-00@mail.test.ex>

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

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

 
 

+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 +69,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