diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/log/0393 | 8 | ||||
| -rw-r--r-- | test/mail/0393.userx | 24 | ||||
| -rw-r--r-- | test/msglog/0393.10HmaX-0005vi-00 | 2 | ||||
| -rw-r--r-- | test/paniclog/0393 | 1 | ||||
| -rwxr-xr-x | test/runtest | 3 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0393 | 5 | ||||
| -rw-r--r-- | test/stderr/0393 | 57 |
7 files changed, 77 insertions, 23 deletions
diff --git a/test/log/0393 b/test/log/0393 index dee87e361..7d70439a0 100644 --- a/test/log/0393 +++ b/test/log/0393 @@ -1,5 +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 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-24): transport filter process failed (127) while writing to TESTSUITE/test-mail/userx: unable to execute command +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/mail/0393.userx b/test/mail/0393.userx index ab724c4ef..24ab3d64f 100644 --- a/test/mail/0393.userx +++ b/test/mail/0393.userx @@ -1,11 +1,33 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name 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 +Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +Testing with filter + +From CALLER@test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@test.ex>) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Testing with filter +Testing without filter + +From CALLER@test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@test.ex>) + id 10HmaZ-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +Testing with expand-to-empty filter diff --git a/test/msglog/0393.10HmaX-0005vi-00 b/test/msglog/0393.10HmaX-0005vi-00 deleted file mode 100644 index 4586818bc..000000000 --- a/test/msglog/0393.10HmaX-0005vi-00 +++ /dev/null @@ -1,2 +0,0 @@ -1999-03-02 09:44:33 Received from CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 userx@test.ex R=r1 T=t1 defer (-24): transport filter process failed (127) while writing to TESTSUITE/test-mail/userx: unable to execute command diff --git a/test/paniclog/0393 b/test/paniclog/0393 deleted file mode 100644 index 0fee43b5a..000000000 --- a/test/paniclog/0393 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-24): transport filter process failed (127) while writing to TESTSUITE/test-mail/userx: unable to execute command diff --git a/test/runtest b/test/runtest index 7e2dbe8eb..6899caeff 100755 --- a/test/runtest +++ b/test/runtest @@ -1362,9 +1362,6 @@ $munges = 'optional_ocsp' => { 'stderr' => '/127.0.0.1 in hosts_requ(ire|est)_ocsp/' }, - 'no_tpt_filter_epipe' => - { 'stderr' => '/^writing error 32: Broken pipe$/' }, - 'optional_cert_hostnames' => { 'stderr' => '/in tls_verify_cert_hostnames\? no/' }, diff --git a/test/scripts/0000-Basic/0393 b/test/scripts/0000-Basic/0393 index f34154c93..dfd549a05 100644 --- a/test/scripts/0000-Basic/0393 +++ b/test/scripts/0000-Basic/0393 @@ -1,10 +1,11 @@ # empty transport filter # -munge no_tpt_filter_epipe -# exim -d-all+transport -odi userx Testing with filter **** exim -DFILTER= -d-all+transport -odi userx Testing without filter **** +exim -DFILTER='${if={1}{1}{}{}}' -d-all+transport -odi userx +Testing with expand-to-empty filter +**** diff --git a/test/stderr/0393 b/test/stderr/0393 index a7d72dc98..c40aa6f52 100644 --- a/test/stderr/0393 +++ b/test/stderr/0393 @@ -70,18 +70,51 @@ lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx writing data block fd=dddd size=sss timeout=0 -process pppp running as transport filter: write=dddd read=dddd writing data block fd=dddd size=sss timeout=0 -process pppp writing to transport filter -copying from the filter -waiting for filter process -filter process returned 127 -waiting for writing process -end of filtering transport writing: yield=0 -errno=-24 more_errno=dd -appendfile yields 10 with errno=-24 more_errno=dd -t1 transport returned PANIC for userx@test.ex -LOG: MAIN PANIC - == userx@test.ex R=r1 T=t1 defer (-24): transport filter process failed (127) while writing to TESTSUITE/test-mail/userx: unable to execute command +writing data block fd=dddd size=sss timeout=0 +appendfile yields 0 with errno=dd more_errno=dd +t1 transport returned OK for userx@test.ex +LOG: MAIN + => userx <userx@test.ex> R=r1 T=t1 +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +LOG: MAIN + <= CALLER@test.ex U=CALLER P=local S=sss +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> +--------> userx@test.ex <-------- +direct command: + argv[0] = ${if={1}{1}{}{}} +direct command after expansion: + argv[0] = +appendfile transport entered +appendfile: mode=600 notify_comsat=0 quota=0 warning=0 + file=TESTSUITE/test-mail/userx format=unix + message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n + message_suffix=\n + maildir_use_size_file=no + locking by lockfile fcntl +lock name: TESTSUITE/test-mail/userx.lock +hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp +lock file created +mailbox TESTSUITE/test-mail/userx is locked +writing to file TESTSUITE/test-mail/userx +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +appendfile yields 0 with errno=dd more_errno=dd +t1 transport returned OK for userx@test.ex +LOG: MAIN + => userx <userx@test.ex> R=r1 T=t1 +LOG: MAIN + Completed >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> |