Additional Sieve test (missed files from previous commit).

diff --git a/test/confs/0428 b/test/confs/0428
index d89b19073b1179a07d03e340131a662380d10bab..60b49e476672b3e86fce711f26780a6459569cf9 100644 (file)
--- a/test/confs/0428
+++ b/test/confs/0428
@@ -43,6 +43,8 @@ r1:
 
 r2:
   driver = redirect
 
 r2:
   driver = redirect

+  local_part_suffix = -*
+  local_part_suffix_optional

   allow_filter
   data = "#Sieve filter\n$h_filter:"
   user = CALLER
   allow_filter
   data = "#Sieve filter\n$h_filter:"
   user = CALLER

diff --git a/test/log/0428 b/test/log/0428
index b812d433431559598b73d0d6a675d4c90e79c8ab..c33ef32664112612dae95f5361b0124f6ba7ea14 100644 (file)
--- a/test/log/0428
+++ b/test/log/0428
@@ -47,3 +47,7 @@
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbL-0005vi-00 => >someone@test.ex <userx@test.ex> R=r2 T=t3
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbL-0005vi-00 => >someone@test.ex <userx@test.ex> R=r2 T=t3
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed

+1999-03-02 09:44:33 10HmbN-0005vi-00 <= someone@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbN-0005vi-00 => TESTSUITE/test-mail/userx <userx-suffix2@test.ex> R=r2 T=t1
+1999-03-02 09:44:33 10HmbN-0005vi-00 => TESTSUITE/test-mail/userx-sawsuffix <userx-suffix@test.ex> R=r2 T=t1
+1999-03-02 09:44:33 10HmbN-0005vi-00 Completed

diff --git a/test/mail/0428.userx b/test/mail/0428.userx
index 72a215aa71a7eefb3c753f6fb0837b0b67dc1c47..8c3402bd77c122324e7a106ad28ba58cdf40d6da 100644 (file)
--- a/test/mail/0428.userx
+++ b/test/mail/0428.userx
@@ -64,3 +64,22 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 13
 
 
 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
+To: userx-suffix@test.ex
+Filter: require ["envelope","fileinto"]; 
+        if envelope :matches :localpart "to" "*-suffix" {
+          fileinto "userx-sawsuffix";
+          stop; 
+        }   
+Message-Id: <E10HmbN-0005vi-00@mail.test.ex>
+From: someone@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test 14
+

diff --git a/test/scripts/0000-Basic/0428 b/test/scripts/0000-Basic/0428
index 940dea89883bfa8e9ce10fea5b081c5b1b58387c..d554c80d0f71a57b26b3d253d960992acb9348a3 100644 (file)
--- a/test/scripts/0000-Basic/0428
+++ b/test/scripts/0000-Basic/0428
@@ -85,3 +85,13 @@ Filter: require ["vacation"];
         vacation "I am gone.  Not here.";
 Test 13
 ****
         vacation "I am gone.  Not here.";
 Test 13
 ****

+# Test use of suffix
+exim -odi -f someone@test.ex userx-suffix userx-suffix2
+To: userx-suffix@test.ex
+Filter: require ["envelope","fileinto"]; 
+        if envelope :matches :localpart "to" "*-suffix" {
+          fileinto "userx-sawsuffix";
+          stop; 
+        }   
+Test 14
+****