refactor

[exim.git] / test / mail / 0079.userx

diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index a76777584196d8b54197ffa2f43af6491d5a433d..b60764ea51671817fe6f54ebdfa2702caa046fbc 100644 (file)
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -6,7 +6,8 @@ Received: from [V4NET.11.12.13] (helo=exim.test.ex ident=CALLER)
        by the.local.host.name with esmtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaX-0005vi-00
        by the.local.host.name with esmtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaX-0005vi-00

-       for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@exim.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Warning: V4NET.11.12.13 is blacklisted at rbl.test.ex
 
 test message data
 X-Warning: V4NET.11.12.13 is blacklisted at rbl.test.ex
 
 test message data


@@ -19,7 +20,8 @@ Received: from [V4NET.11.12.14] (helo=exim.test.ex ident=CALLER)
        by the.local.host.name with esmtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaY-0005vi-00
        by the.local.host.name with esmtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaY-0005vi-00

-       for postmaster@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for postmaster@exim.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Warning: V4NET.11.12.14 is blacklisted at rbl.test.ex
 X-Warning: V4NET.11.12.14 is blacklisted at rbl2.test.ex
 
 X-Warning: V4NET.11.12.14 is blacklisted at rbl.test.ex
 X-Warning: V4NET.11.12.14 is blacklisted at rbl2.test.ex
 


@@ -29,14 +31,16 @@ From postmaster@exim.test.ex Tue Mar 02 09:44:33 1999
 Return-path: <postmaster@exim.test.ex>
 Envelope-to: userx@exim.test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <postmaster@exim.test.ex>
 Envelope-to: userx@exim.test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaZ-0005vi-00
        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaZ-0005vi-00

-       for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+       for userx@exim.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 sysmail: yes
 sysmail: yes

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

 From: postmaster@exim.test.ex
 From: postmaster@exim.test.ex

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

 
 Testing mail from system filter
 
 
 Testing mail from system filter
 


@@ -46,14 +50,15 @@ Envelope-to: userx@exim.test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00

-       for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+       for userx@exim.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 To: userx@exim.test.ex
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
 References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 To: userx@exim.test.ex
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
 References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied

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

 From: CALLER@exim.test.ex
 From: CALLER@exim.test.ex

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

 
 testing testing
 
 
 testing testing