tidying

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

diff --git a/test/scripts/0000-Basic/0581 b/test/scripts/0000-Basic/0581
index f0ce3bcd7522d370265f13f330bfdb89632ca20c..1253ddd27a8faff9e90dbca795e0e8afb96a3b94 100644 (file)
--- a/test/scripts/0000-Basic/0581
+++ b/test/scripts/0000-Basic/0581
@@ -29,6 +29,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250 
 MAIL FROM:<userc@ok.example>
 ??? 250
@@ -47,6 +48,8 @@ QUIT
 sleep 1
 killdaemon
 #
+exim -z 'test2'
+****
 #
 # smtp send, deliver_drop_priv
 server PORT_S
@@ -75,6 +78,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250 
 MAIL FROM:<usere@ok.example>
 ??? 250
@@ -94,6 +98,8 @@ sleep 1
 killdaemon
 #
 #
+exim -z 'test3'
+****
 # multiple recipients
 # 1st callout result is cached (above); should not activate LCC
 # smtp send
@@ -125,7 +131,7 @@ QUIT
 221 Bye
 ****
 #
-exim -DSERVER=server -bd -oX PORT_D
+exim -d+all -DSERVER=server -bd -oX PORT_D
 ****
 #
 client 127.0.0.1 PORT_D
@@ -135,6 +141,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250 
 MAIL FROM:<userc@ok.example>
 ??? 250
@@ -155,6 +162,8 @@ QUIT
 sleep 1
 #
 #
+exim -z 'test4'
+****
 # 2nd callout result is cached (above); should not activate LCC
 # smtp send
 server PORT_S 2
@@ -185,6 +194,13 @@ QUIT
 221 Bye
 ****
 #
+# XXX this test intermittently fails, at this client...
+# the client gets a 451 rcpt-v fail for userd3
+# the stderr-server says it got a conn-refused for the verify callout, which should have
+#  gone to the above "server" command, first of the 2 conns it is expecting
+# the stdout-server shows "server" handling the previous subtest (userd, userd2) fine, plus
+#  a fresh "server" startup and listen.  Which should have been this one... perhaps it was
+#  not there in time?  Add server-wait synch point for _previous_ server, using dummy "exim -z".
 client 127.0.0.1 PORT_D
 ??? 220
 EHLO test.ex
@@ -192,6 +208,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250 
 MAIL FROM:<userc@ok.example>
 ??? 250
@@ -212,6 +229,8 @@ QUIT
 sleep 1
 #
 #
+exim -z 'test5'
+****
 # no cache hits; should do LCC
 # smtp send
 server PORT_S 2
@@ -239,6 +258,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250 
 MAIL FROM:<userc@ok.example>
 ??? 250
@@ -261,4 +281,5 @@ killdaemon
 #
 #
 no_stdout_check
+no_stderr_check
 no_msglog_check