Fix my earlier "fix" for intermittently deliverable recipients.

[users/jgh/exim.git] / test / stdout / 5204

diff --git a/test/stdout/5204 b/test/stdout/5204
index 52f9242b96fae20891c14b8900458acee5badbb5..532eb41d7b1d44ae1edc63aabcc9a304b43e5e85 100644 (file)
--- a/test/stdout/5204
+++ b/test/stdout/5204
@@ -1,21 +1,15 @@
-"ACCEPT hosts=localhost lookup=byname"@some.host cannot be resolved at this time:
-  remote host address is the local host
-"DECLINE cannot route this one (DECLINE)"@some.host is undeliverable:
-  Unrouteable address
-"FAIL cannot route this one (FAIL)"@some.host is undeliverable:
-  cannot route this one (FAIL)
-"ERROR cannot route this one (ERROR)"@some.host cannot be resolved at this time:
-  bad command yield: ERROR cannot route this one (ERROR)
-"DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time:
-  cannot route this one (DEFER)
+"ACCEPT hosts=localhost lookup=byname"@some.host cannot be resolved at this time: remote host address is the local host
+"DECLINE cannot route this one (DECLINE)"@some.host is undeliverable: Unrouteable address
+"FAIL cannot route this one (FAIL)"@some.host is undeliverable: cannot route this one (FAIL)
+"ERROR cannot route this one (ERROR)"@some.host cannot be resolved at this time: bad command yield: ERROR cannot route this one (ERROR)
+"DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time: cannot route this one (DEFER)

 "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
   router = q, transport = other_smtp
   host ten-1.test.ex [V4NET.0.0.1] 
 PASS@some.host
   router = s, transport = smtp
   host 127.0.0.1 [127.0.0.1] 
 "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
   router = q, transport = other_smtp
   host ten-1.test.ex [V4NET.0.0.1] 
 PASS@some.host
   router = s, transport = smtp
   host 127.0.0.1 [127.0.0.1] 

-"FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time:
-  cannot route this one (FREEZE)
+"FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time: cannot route this one (FREEZE)

 postmaster@test.ex
     <-- "REDIRECT postmaster@test.ex"@some.host
   router = pm, transport = null
 postmaster@test.ex
     <-- "REDIRECT postmaster@test.ex"@some.host
   router = pm, transport = null


@@ -27,6 +21,7 @@ postmaster@test.ex
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello some.name [V4NET.2.3.4]\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello some.name [V4NET.2.3.4]\r
 250-SIZE 52428800\r

+250-8BITMIME\r

 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r