Testsuite: changes for VFRY update, 4f6ae5c314e5

diff --git a/test/log/0562 b/test/log/0562
index 43b67db11ab6c72078ff07081788664e63a931b8..0f19e9cf45afa829a822f1a9a0ee19b179fc8850 100644 (file)
--- a/test/log/0562
+++ b/test/log/0562
@@ -6,10 +6,7 @@
 1999-03-02 09:44:33 NOTQUIT reason: 'connection-lost'
 1999-03-02 09:44:33 NOTQUIT reason: 'bad-commands'
 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many unrecognized commands (last was "unknown")
-1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY 
-1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY 
-1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY 
-1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY 
+1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY foo@bar
 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many nonmail commands (last was "vrfy")
 1999-03-02 09:44:33 NOTQUIT reason: 'bad-commands'
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(abcd) [127.0.0.1] F=<userx@test.ex> rejected after DATA

diff --git a/test/rejectlog/0562 b/test/rejectlog/0562
index d10c450f63d98ac9b47627a816878aa072caca1b..951f79e39c6129543eec58cfa6006a2b926682a9 100644 (file)
--- a/test/rejectlog/0562
+++ b/test/rejectlog/0562
@@ -1,8 +1,5 @@
 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many unrecognized commands (last was "unknown")
-1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY 
-1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY 
-1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY 
-1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY 
+1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY foo@bar
 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many nonmail commands (last was "vrfy")
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(abcd) [127.0.0.1] F=<userx@test.ex> rejected after DATA
 Envelope-from: <userx@test.ex>

diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562
index 9355c46fcc5d82324282aaa928c480dacb5d36e4..b829dff30a0184c9e52fdae4610cf01193f396b4 100644 (file)
--- a/test/scripts/0000-Basic/0562
+++ b/test/scripts/0000-Basic/0562
@@ -39,13 +39,13 @@ unknown
 client 127.0.0.1 PORT_D
 ??? 220
 vrfy
+??? 501
+vrfy foo@bar
 ??? 252
 vrfy
-??? 252
-vrfy
-??? 252
+??? 501
 vrfy
-??? 252
+??? 501
 vrfy
 ??? 554
 ****

diff --git a/test/stdout/0562 b/test/stdout/0562
index 693fddace4aa1c5cf56c567f08793ddbc1d1a827..a32896899889dd339f371c034aeb52a7908792c6 100644 (file)
--- a/test/stdout/0562
+++ b/test/stdout/0562
@@ -51,17 +51,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> vrfy
+??? 501
+<<< 501 empty address
+>>> vrfy foo@bar
 ??? 252
 <<< 252 Administrative prohibition
 >>> vrfy
-??? 252
-<<< 252 Administrative prohibition
+??? 501
+<<< 501 empty address
 >>> vrfy
-??? 252
-<<< 252 Administrative prohibition
->>> vrfy
-??? 252
-<<< 252 Administrative prohibition
+??? 501
+<<< 501 empty address
 >>> vrfy
 ??? 554
 <<< 554 Too many nonmail commands