Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0547

diff --git a/test/scripts/0000-Basic/0547 b/test/scripts/0000-Basic/0547
index b628c2278309c5ca98eeb069470cee804c5c5c7f..df409eac2ee6a0ade16b863dfc165ab803e1c5b4 100644 (file)
--- a/test/scripts/0000-Basic/0547
+++ b/test/scripts/0000-Basic/0547
@@ -1,21 +1,25 @@
 # log_selector = +smtp_no_mail
 need_ipv4
 #
 # log_selector = +smtp_no_mail
 need_ipv4
 #

-exim -DSERVER=server -bd -oX PORT_D
+exim -DSERVER=server -DLOG_SELECTOR=+millisec -bd -oX PORT_D

 ****
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ****
 ??? 220
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+killdaemon
+exim -DSERVER=server -bd -oX PORT_D
+****
+client 127.0.0.1 PORT_D

 ??? 220
 quit
 ??? 221
 ****
 ??? 220
 quit
 ??? 221
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo x.y.z
 ??? 250
 ??? 250
 ??? 220
 ehlo x.y.z
 ??? 250
 ??? 250

+??? 250-

 ??? 250
 ??? 250
 ??? 250
 ??? 250
 ??? 250
 ??? 250


@@ -24,12 +28,13 @@ VRFY a@b.c
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo x.y.z
 ??? 250
 ??? 250
 ??? 250
 ??? 220
 ehlo x.y.z
 ??? 250
 ??? 250
 ??? 250

+??? 250-

 ??? 250
 ??? 250
 MAIL FROM:<>
 ??? 250
 ??? 250
 MAIL FROM:<>