diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/README | 7 | ||||
| -rw-r--r-- | test/confs/5009 | 49 | ||||
| -rw-r--r-- | test/log/5009 | 9 | ||||
| -rwxr-xr-x | test/runtest | 5 | ||||
| -rw-r--r-- | test/scripts/5000-maildir/5009 | 19 | ||||
| -rw-r--r-- | test/stdout/5009 | 11 |
6 files changed, 95 insertions, 5 deletions
diff --git a/test/README b/test/README index 13284ab2c..004477e70 100644 --- a/test/README +++ b/test/README @@ -1,4 +1,4 @@ -$Cambridge: exim/test/README,v 1.2 2006/02/10 16:29:20 ph10 Exp $ +$Cambridge: exim/test/README,v 1.3 2006/04/25 14:02:30 ph10 Exp $ EXPORTABLE EXIM TEST SUITE -------------------------- @@ -705,8 +705,9 @@ deliveries because on different systems the processes may terminate in a different order. -A number of standard file management commands are recognized. These are chmod, -chown, ln, ls, du, mkdir, mkfifo, and touch. Some are run as root using "sudo". +A number of standard file management commands are recognized. These are cat, +chmod, chown, cp, ln, ls, du, mkdir, mkfifo, rm, rmdir, and touch. Some are run +as root using "sudo". Commands with input diff --git a/test/confs/5009 b/test/confs/5009 new file mode 100644 index 000000000..a2f673d9e --- /dev/null +++ b/test/confs/5009 @@ -0,0 +1,49 @@ +# Exim test configuration 5009 + +SUB= + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + + +# ----- Main settings ----- + +qualify_domain = test.ex + + +# ----- Routers ----- + +begin routers + +r1: + driver = accept + transport = t1 + +# ----- Transports ----- + +begin transports + +t1: + driver = appendfile + directory = DIR/test-mail/SUB + user = CALLER + maildir_format + maildir_use_size_file + maildir_quota_directory_regex = ^(?:cur|new|\.(?!Trash).*)$ + quota = 1M + + +# ----- Retry ----- + +begin retry + +* * F,1d,1d + + +# End diff --git a/test/log/5009 b/test/log/5009 new file mode 100644 index 000000000..7d70439a0 --- /dev/null +++ b/test/log/5009 @@ -0,0 +1,9 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed diff --git a/test/runtest b/test/runtest index d6b3fac7f..91b64e8e9 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.8 2006/04/20 15:34:25 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.9 2006/04/25 14:02:30 ph10 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -613,7 +613,7 @@ while(<IN>) s/\b\d+\.H\d+P\d+\b/dddddddddd.HddddddPddddd/; # Maildirsize data - if (/^\d+S,\d+C\s*$/) + while (/^\d+S,\d+C\s*$/) { print MUNGED; while (<IN>) @@ -623,6 +623,7 @@ while(<IN>) } last if !defined $_; } + last if !defined $_; # ======== Output from the "fd" program about open descriptors ======== diff --git a/test/scripts/5000-maildir/5009 b/test/scripts/5000-maildir/5009 new file mode 100644 index 000000000..1a2e5fc3a --- /dev/null +++ b/test/scripts/5000-maildir/5009 @@ -0,0 +1,19 @@ +# maildirsize with maildir_quota_directory_regex +# +exim -odi userx@test.ex +Test message +**** +cat DIR/test-mail/maildirsize >>test-stdout +mkdir test-mail/.Sub +touch test-mail/.Sub/maildirfolder +exim -DSUB=.Sub -odi userx@test.ex +Test message +**** +cat DIR/test-mail/maildirsize >>test-stdout +mkdir test-mail/.Trash +touch test-mail/.Trash/maildirfolder +exim -DSUB=.Trash -odi userx@test.ex +Test message +**** +cat DIR/test-mail/maildirsize >>test-stdout +no_message_check diff --git a/test/stdout/5009 b/test/stdout/5009 new file mode 100644 index 000000000..65318c458 --- /dev/null +++ b/test/stdout/5009 @@ -0,0 +1,11 @@ +1048576S,0C +ddd d +ddd d +1048576S,0C +ddd d +ddd d +ddd d +1048576S,0C +ddd d +ddd d +ddd d |