Testsuite: avoid total fail on DISABLE_EVENT build

[exim.git] / test / mail / 4620.CALLER

diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER
index b0a1372da48462fd3408b7da4d4e800d01e75c91..48d3e98c6e70dd4bdf911039833b6db427a5edf2 100644 (file)
--- a/test/mail/4620.CALLER
+++ b/test/mail/4620.CALLER
@@ -1,16 +1,22 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999

+Received: from localhost ([127.0.0.1] helo=the.local.host.name)
+       by the.local.host.name with esmtp (Exim x.yz)
+       id 10HmbA-000000005vi-0000
+       for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)

-       id 10HmaZ-0005vi-00
-       for SRS0=12a1=yg=the.local.host.name=CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-000000005vi-0000
+       for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Failed-Recipients: remote_user@remote.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
 X-Failed-Recipients: remote_user@remote.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>

-To: SRS0=12a1=yg=the.local.host.name=CALLER@test.ex
-References: <E10HmaX-0005vi-00@the.local.host.name>
+To: SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex
+References: <E10HmaX-000000005vi-0000@the.local.host.name>

 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM


@@ -36,17 +42,19 @@ Status: 5.0.0
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 

-Return-path: <SRS0=12a1=yg=the.local.host.name=CALLER@test.ex>
+Return-path: <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex>

 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
        by the.local.host.name with esmtp (Exim x.yz)
 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
        by the.local.host.name with esmtp (Exim x.yz)

-       (envelope-from <SRS0=12a1=yg=the.local.host.name=CALLER@test.ex>)
-       id 10HmaY-0005vi-00
-       for remote_user@remote.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       (envelope-from <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex>)
+       id 10HmaY-000000005vi-0000
+       for remote_user@remote.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)

-       id 10HmaX-0005vi-00
-       for redirect@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+       id 10HmaX-000000005vi-0000
+       for redirect@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>

 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000