diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-16 10:05:33 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-16 10:05:33 +0000 |
| commit | 75e0e026a196fa852a855d5148f29be29ac2d92f (patch) | |
| tree | cbf860a3c39a64dbce2b274a00262cc6baae2f47 /test/stdout | |
| parent | 230205fc0acfc71dff9ce42fb20d2caba82fbd36 (diff) | |
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.
Diffstat (limited to 'test/stdout')
| -rw-r--r-- | test/stdout/0020 | 2 | ||||
| -rw-r--r-- | test/stdout/0365 | 2 | ||||
| -rw-r--r-- | test/stdout/0430 | 2 | ||||
| -rw-r--r-- | test/stdout/0467 | 2 | ||||
| -rw-r--r-- | test/stdout/1006 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/stdout/0020 b/test/stdout/0020 index cf3448d8f..8836b7d43 100644 --- a/test/stdout/0020 +++ b/test/stdout/0020 @@ -1,5 +1,5 @@ -**** SMTP testing session as if from host 10.250.104.7 +**** SMTP testing session as if from host 10.250.104.42 **** but without any ident (RFC 1413) callback. **** This is not for real! diff --git a/test/stdout/0365 b/test/stdout/0365 index dbc30953f..9df565eaf 100644 --- a/test/stdout/0365 +++ b/test/stdout/0365 @@ -33,7 +33,7 @@ 250 Accepted
354 Enter message, ending with "." on a line by itself
550-Rejected after DATA: '>' missing at end of address:
-550 failing address in "From" header is: <bad@syntax
+550 failing address in "From:" header is: <bad@syntax
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
diff --git a/test/stdout/0430 b/test/stdout/0430 index d41c39573..2277389c4 100644 --- a/test/stdout/0430 +++ b/test/stdout/0430 @@ -47,8 +47,8 @@ x@manual.route cannot be resolved at this time: lowest numbered MX record points to local host x@manual.route router = r1, transport = t1 - host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5 host ten-1.test.ex [V4NET.0.0.1] MX=5 + host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5 host ten-6.test.ex [V4NET.0.0.6] x@manual.route is undeliverable: lowest numbered MX record points to local host diff --git a/test/stdout/0467 b/test/stdout/0467 index d9c20263c..60ffdae03 100644 --- a/test/stdout/0467 +++ b/test/stdout/0467 @@ -5,8 +5,8 @@ x@srv01.test.ex host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25 x@mx246.test.ex router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] MX=10 host v6.test.ex [unknown] MX=10 ** unusable ** + host ten-1.test.ex [V4NET.0.0.1] MX=10 x@srv02.test.ex router = r1, transport = t1 host ten-1.test.ex [V4NET.0.0.1] MX=1 port=99 diff --git a/test/stdout/1006 b/test/stdout/1006 index 98fab55b4..df65718fe 100644 --- a/test/stdout/1006 +++ b/test/stdout/1006 @@ -1,7 +1,7 @@ dnslookup@mx46.test.ex router = r1, transport = smtp - host 46.test.ex [V4NET.0.0.4] MX=46 host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 + host 46.test.ex [V4NET.0.0.4] MX=46 manualroute@test.ex router = r2, transport = smtp host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] |