diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-10-03 10:25:55 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-10-03 10:25:55 +0000 |
| commit | e6f6568e74c9aeb07d8cb02ecb1d997284eb885f (patch) | |
| tree | 0e830f2dfb76860d3d12abc2cf15db5b48427e79 /test | |
| parent | ff75a1f763cb8ff03437de60b73491bb20cc76ba (diff) | |
Fix misleading verification output when -v is used with -bv and aliasing
leads to a mixture of successful and unsuccessful verification.
Diffstat (limited to 'test')
| -rw-r--r-- | test/aux-fixed/0212.aliases | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0212 | 7 | ||||
| -rw-r--r-- | test/stdout/0212 | 24 |
3 files changed, 25 insertions, 8 deletions
diff --git a/test/aux-fixed/0212.aliases b/test/aux-fixed/0212.aliases index 064b67d58..c6c26ccfc 100644 --- a/test/aux-fixed/0212.aliases +++ b/test/aux-fixed/0212.aliases @@ -6,3 +6,5 @@ f1: :fail: bad user p: userx pipe: |/bin/nosuchfile file: /tmp/junk +v1: a3, userx +v2: userx, a3 diff --git a/test/scripts/0000-Basic/0212 b/test/scripts/0000-Basic/0212 index 534f0d94c..29a8d25aa 100644 --- a/test/scripts/0000-Basic/0212 +++ b/test/scripts/0000-Basic/0212 @@ -40,3 +40,10 @@ vrfy <"smartuser.b@test.ex"@test.ex> vrfy <"smartuser.b@test.ex,a@test.ex"@test.ex> quit **** +# Check fail/non-fail without and with -v +0 +exim -bv v1 v2 +**** +2 +exim -v -bv v1 v2 +**** diff --git a/test/stdout/0212 b/test/stdout/0212 index 382af7bbe..9f1626ae4 100644 --- a/test/stdout/0212 +++ b/test/stdout/0212 @@ -1,17 +1,13 @@ > a@test.ex verified -> b@test.ex failed to verify: - Unrouteable address -> f@test.ex failed to verify: - bad user +> b@test.ex failed to verify: Unrouteable address +> f@test.ex failed to verify: bad user > p@test.ex verified -> x@test.ex failed to verify: - Unrouteable address +> x@test.ex failed to verify: Unrouteable address > y@test.ex verified > pipe@test.ex verified > file@test.ex verified > "smartuser.a@test.ex"@test.ex verified -> "smartuser.b@test.ex"@test.ex failed to verify: - Unrouteable address +> "smartuser.b@test.ex"@test.ex failed to verify: Unrouteable address > "smartuser.b@test.ex,a@test.ex"@test.ex verified > 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -40,3 +36,15 @@ 550 <"smartuser.b@test.ex"@test.ex> Unrouteable address
250 <"smartuser.b@test.ex,a@test.ex"@test.ex> is deliverable
221 the.local.host.name closing connection
+v1@test.ex verified +v2@test.ex verified +a3@test.ex failed to verify: bad user + <-- v1@test.ex +userx@test.ex + <-- v1@test.ex + router = all, transport = local_delivery +a3@test.ex failed to verify: bad user + <-- v2@test.ex +userx@test.ex [duplicate, would not be delivered] + <-- v2@test.ex + router = all, transport = local_delivery |