Bug fix for yesterday's change, which worked in a production system

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

diff --git a/test/mail/0428.userx b/test/mail/0428.userx
index 72a215aa71a7eefb3c753f6fb0837b0b67dc1c47..3e9cbd4f5ddd9d4cafb0f9d4f52a270d8e6d7fe6 100644 (file)
--- a/test/mail/0428.userx
+++ b/test/mail/0428.userx
@@ -6,9 +6,9 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        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
 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 1
 
@@ -20,10 +20,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Filter: if true { stop; fileinto "inbox.never"; }
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@mail.test.ex>
+Filter: if true { stop; fileinto "inbox.never"; }
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 7
 
@@ -35,15 +35,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbH-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbH-0005vi-00@mail.test.ex>
 X-Sieve: 99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "98" {
           fileinto "inbox.JUNK";
           stop;
         }
-Message-Id: <E10HmbH-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 9
 
@@ -55,12 +55,31 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <someone@test.ex>)
        id 10HmbL-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbL-0005vi-00@mail.test.ex>
 To: userx@test.ex
 Filter: require ["vacation"]; 
         vacation "I am gone.  Not here.";
-Message-Id: <E10HmbL-0005vi-00@mail.test.ex>
 From: someone@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 13
 
+From someone@test.ex Tue Mar 02 09:44:33 1999
+Return-path: <someone@test.ex>
+Envelope-to: userx-suffix2@test.ex
+Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
+Received: from CALLER by mail.test.ex with local (Exim x.yz)
+       (envelope-from <someone@test.ex>)
+       id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbN-0005vi-00@mail.test.ex>
+To: userx-suffix@test.ex
+Filter: require ["envelope","fileinto"]; 
+        if envelope :matches :localpart "to" "*-suffix" {
+          fileinto "userx-sawsuffix";
+          stop; 
+        }   
+From: someone@test.ex
+
+Test 14
+