From 75e0e026a196fa852a855d5148f29be29ac2d92f Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Thu, 16 Feb 2006 10:05:33 +0000 Subject: Code tidies to remove stuff that was needed only for the old test suite. Also, use -odi for bounces when in the test harness, unless queue_only is set. --- test/log/0026 | 4 ++-- test/log/0162 | 2 +- test/log/0214 | 2 +- test/log/0241 | 4 ++-- test/log/0365 | 4 ++-- test/log/0366 | 16 ++++++++-------- test/log/0455 | 6 +++--- test/log/0465 | 2 +- test/log/0476 | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) (limited to 'test/log') diff --git a/test/log/0026 b/test/log/0026 index c3cd47846..be92f738a 100644 --- a/test/log/0026 +++ b/test/log/0026 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: domain missing or malformed: failing address in "From" header is: @ -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From" header is: @ +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ +1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F= rejected after DATA: body contains trigger diff --git a/test/log/0162 b/test/log/0162 index c2ae95119..07b33baf9 100644 --- a/test/log/0162 +++ b/test/log/0162 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: malformed address: ">,\n ,\n may not follow ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n rejected after DATA: malformed address: ">,\n ,\n may not follow ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n ,\n rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address +1999-03-02 09:44:33 10HmaX-0005vi-00 H=[127.0.0.1] F= rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address diff --git a/test/log/0241 b/test/log/0241 index 43f3f6ed7..c5776cbff 100644 --- a/test/log/0241 +++ b/test/log/0241 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -t failed: Not a directory +1999-03-02 09:44:33 10HmaX-0005vi-00 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -odi failed: Not a directory 1999-03-02 09:44:33 10HmaX-0005vi-00 == >postmaster T=address_reply defer (0): Failed to send message from address_reply transport (127) 1999-03-02 09:44:33 10HmaX-0005vi-00 Frozen by the system filter: everything's freezing today 1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 unfrozen by CALLER 1999-03-02 09:44:33 Start queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx R=all T=local -1999-03-02 09:44:33 10HmaX-0005vi-00 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -t failed: Not a directory +1999-03-02 09:44:33 10HmaX-0005vi-00 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -odi failed: Not a directory 1999-03-02 09:44:33 10HmaX-0005vi-00 == >postmaster T=address_reply defer (0): Failed to send message from address_reply transport (127) 1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/0365 b/test/log/0365 index 24c476512..569e49dfd 100644 --- a/test/log/0365 +++ b/test/log/0365 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From" header is: rejected after DATA: '>' missing at end of address: failing address in "From:" header is: rejected after DATA: there is no valid sender in any header line 1999-03-02 09:44:33 U=CALLER sender verify defer for : could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error 1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : Could not complete sender verify callout @@ -7,7 +7,7 @@ 1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT : failure message 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT : defer message -1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From" header is: rejected after DATA: '>' missing at end of address: failing address in "From:" header is: rejected after DATA: there is no valid sender in any header line 1999-03-02 09:44:33 U=CALLER sender verify defer for : could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error 1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : Could not complete sender verify callout diff --git a/test/log/0366 b/test/log/0366 index 311c26b56..0104beded 100644 --- a/test/log/0366 +++ b/test/log/0366 @@ -1,20 +1,20 @@ 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 ten-1.test.ex [V4NET.0.0.1] Network Error -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-5.test.ex [V4NET.0.0.5] Network Error -1999-03-02 09:44:33 10HmaX-0005vi-00 black-1.test.ex [V4NET.11.12.13] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 black-2.test.ex [V4NET.11.12.14] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@mxt99.test.ex R=r1 T=smtp defer (dd): Network Error 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-5.test.ex [V4NET.0.0.5] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-6.test.ex [V4NET.0.0.6] Network Error -1999-03-02 09:44:33 10HmaX-0005vi-00 black-1.test.ex [V4NET.11.12.13] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 black-2.test.ex [V4NET.11.12.14] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 black-1.test.ex [V4NET.11.12.13] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@mxt99.test.ex R=r1 T=smtp defer (dd): Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@mxt99.test.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss diff --git a/test/log/0455 b/test/log/0455 index 3e7fd8b7c..caeab737b 100644 --- a/test/log/0455 +++ b/test/log/0455 @@ -1,11 +1,11 @@ 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 ten-1.test.ex [V4NET.0.0.1] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network Error 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@mxt97.test.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss diff --git a/test/log/0465 b/test/log/0465 index ee6899ce1..5a31739eb 100644 --- a/test/log/0465 +++ b/test/log/0465 @@ -1,3 +1,3 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= abc@somewhere U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To" header is: abc@xyz. +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz. diff --git a/test/log/0476 b/test/log/0476 index 6ae09c35e..c48ae1b53 100644 --- a/test/log/0476 +++ b/test/log/0476 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=r1 T=t1: SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 550 NO 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host 1999-03-02 09:44:33 End queue run: pid=pppp -- cgit v1.2.3