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.

5 files changed, 7 insertions, 7 deletions

diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index c902e78fc..384d6ef6e 100644
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<x@y> 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=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <x@y>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
@@ -8,7 +8,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 F From: @
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-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 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
diff --git a/test/rejectlog/0162 b/test/rejectlog/0162
index d9c7597a6..515596920 100644
--- a/test/rejectlog/0162
+++ b/test/rejectlog/0162
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: malformed address: ">,\n  <u213@shrike.depaul.edu>,\n may not follow <u212@shrike.depaul.edu: failing address in "To" header begins: <u212@shrike.depaul.edu">,\n  <u213@shrike.depaul.edu>,\n  <u214@hotmail.com>,\n  <u215@hotmail.com>,\n  <u216@hotmail.com>,\n  <u217@hotmail.com>,\n  <u218@hotmail.com>,\n  <u219@angelfire.com>,\n  <u220@chickmail.com>,\n  <u221@excite.com>,\n  <u222@chickmail.com>,\n  <u223@eudoramail.com>,\n  <u224@alleyne.demon.co.uk>,\n  <u225@dial.pipex.com>,\n  <u226@hotmail.com>,\n  <u227@gpu.srv.ualberta.ca>,\n  <u228@ulst.ac.uk>,\n  <u229@worldnet.att.net>,\n  <u230@hotmail.com>,\n  <u231@careerbuildermail.com>,\n  <u232@MSN.COM>,\n  <u233@angelfire.com>,\n  <u234@hotmail.com>,\n  <u235@hotmail.com>,\n  <u236@compuserve.com>,\n  <u237@compuserve.com>,\n  <u238@hotmail.com>,\n  <u239@bellsouth.net>,\n  <u240@n64rocks.com>,\n  <u241@mailexcite.com>,\n  <u242@mailexcite.com>,\n  <u243@mailcity.com>,\n  <u244@bigfoot.com>,\n  <u245@sunbeach.net>,\n  <u246@mailcity.com>,\n  <u247@pacbell.net>,\n  <u248@hotmail.com>,\n  <u249@worldnet.att.net>,\n  <u250@bigfoot.com>,\n  <u251@mailexcite.com>,\n  <u252@netnoir.net>,\n  <u253@cablecomm1.pcs.mot.com>,\n  <u254@compu
+1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: malformed address: ">,\n  <u213@shrike.depaul.edu>,\n may not follow <u212@shrike.depaul.edu: failing address in "To:" header begins: <u212@shrike.depaul.edu">,\n  <u213@shrike.depaul.edu>,\n  <u214@hotmail.com>,\n  <u215@hotmail.com>,\n  <u216@hotmail.com>,\n  <u217@hotmail.com>,\n  <u218@hotmail.com>,\n  <u219@angelfire.com>,\n  <u220@chickmail.com>,\n  <u221@excite.com>,\n  <u222@chickmail.com>,\n  <u223@eudoramail.com>,\n  <u224@alleyne.demon.co.uk>,\n  <u225@dial.pipex.com>,\n  <u226@hotmail.com>,\n  <u227@gpu.srv.ualberta.ca>,\n  <u228@ulst.ac.uk>,\n  <u229@worldnet.att.net>,\n  <u230@hotmail.com>,\n  <u231@careerbuildermail.com>,\n  <u232@MSN.COM>,\n  <u233@angelfire.com>,\n  <u234@hotmail.com>,\n  <u235@hotmail.com>,\n  <u236@compuserve.com>,\n  <u237@compuserve.com>,\n  <u238@hotmail.com>,\n  <u239@bellsouth.net>,\n  <u240@n64rocks.com>,\n  <u241@mailexcite.com>,\n  <u242@mailexcite.com>,\n  <u243@mailcity.com>,\n  <u244@bigfoot.com>,\n  <u245@sunbeach.net>,\n  <u246@mailcity.com>,\n  <u247@pacbell.net>,\n  <u248@hotmail.com>,\n  <u249@worldnet.att.net>,\n  <u250@bigfoot.com>,\n  <u251@mailexcite.com>,\n  <u252@netnoir.net>,\n  <u253@cablecomm1.pcs.mot.com>,\n  <u254@compu
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <u3@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
diff --git a/test/rejectlog/0214 b/test/rejectlog/0214
index d9b3efa1d..614af1fb5 100644
--- a/test/rejectlog/0214
+++ b/test/rejectlog/0214
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[127.0.0.1] F=<x@y.x> 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=<x@y.x> 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
 Envelope-from: <x@y.x>
 Envelope-to: <x@test.ex>
 P Received: from [127.0.0.1]
diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 6dee64036..5dbe6259a 100644
--- a/test/rejectlog/0365
+++ b/test/rejectlog/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: <bad@syntax
+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: <bad@syntax
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
@@ -40,7 +40,7 @@ I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: 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 <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: 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: <bad@syntax
+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: <bad@syntax
 1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
diff --git a/test/rejectlog/0465 b/test/rejectlog/0465
index 76d9dbf92..cab143858 100644
--- a/test/rejectlog/0465
+++ b/test/rejectlog/0465
@@ -1,4 +1,4 @@
-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.
 Envelope-from: <>
 Envelope-to: <abc@xyz>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)