Retry once a single-item delivery from the queue, when lock causes no attempt

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

diff --git a/test/mail/0137.userx b/test/mail/0137.userx
index 7b7147c95c18a22f387be35826a6e2e325e141f3..cfcf6e2f788b0d520a99a19b7afdc0e80db3f11e 100644 (file)
--- a/test/mail/0137.userx
+++ b/test/mail/0137.userx
@@ -1,48 +1,56 @@
-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From t1@foo Tue Mar 02 09:44:33 1999

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

-       (envelope-from <CALLER@test.ex>)
+       (envelope-from <t1@foo>)

        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

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

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

-Transport: local_delivery
-From: CALLER_NAME <CALLER@test.ex>
+From: CALLER_NAME <t1@foo>
+Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 

+local_delivery

 First message.
 
 First message.
 

-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From t1@foo Tue Mar 02 09:44:33 1999

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

-       (envelope-from <CALLER@test.ex>)
+       (envelope-from <t1@foo>)

        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

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

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

-Transport: local_delivery
-From: CALLER_NAME <CALLER@test.ex>
+From: CALLER_NAME <t1@foo>
+Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 

+local_delivery

 Second message
 
 Second message
 

-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From t2@foo Tue Mar 02 09:44:33 1999

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

-       (envelope-from <CALLER@test.ex>)
+       (envelope-from <t2@foo>)

        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

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

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

-Transport: local_delivery_fcntl
-From: CALLER_NAME <CALLER@test.ex>
+From: CALLER_NAME <t2@foo>
+Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 

+local_delivery_fcntl

 Third message
 
 Third message
 

-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From t3@foo Tue Mar 02 09:44:33 1999

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

-       (envelope-from <CALLER@test.ex>)
+       (envelope-from <t3@foo>)

        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

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

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

-Transport: local_delivery_fcntl_blocking
-From: CALLER_NAME <CALLER@test.ex>
+From: CALLER_NAME <t3@foo>
+Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 

+local_delivery_fcntl_blocking

 Fourth message
 
 Fourth message