Testsuite: add delays for predictable log sequencing in 2x36, log-sorting for 2x38

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

diff --git a/test/mail/0095.userx b/test/mail/0095.userx
index 5e720e10b92e0f3632622e967cf3970ae39c1e17..bd5e61c81f21d3237abd2f732374a5925d54fa78 100644 (file)
--- a/test/mail/0095.userx
+++ b/test/mail/0095.userx
@@ -40,16 +40,14 @@ Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
        id 10HmbA-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied

-From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
+From : p@q
+Reply-To: a@b

 To: userx@myhost.test.ex
 Subject: Your mailbox
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 To: userx@myhost.test.ex
 Subject: Your mailbox
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 

-This message is automatically created by mail delivery software (Exim).
-
-The size of your mailbox has exceeded a warning threshold that is
-set by the system administrator.
+Your mailbox has crossed the threshold

 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)


@@ -68,6 +66,7 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+Reply-To: x@y

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: userx@myhost.test.ex