Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0628 b/test/scripts/0000-Basic/0628
index e5f37771ba9fdda5d6a269a83501226a6b9d0099..1c76f0735d760eb485fa86180e25e7691112bb32 100644 (file)
--- a/test/scripts/0000-Basic/0628
+++ b/test/scripts/0000-Basic/0628
@@ -12,6 +12,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250 
 MAIL FROM:<tester@test.ex>
 ??? 250
 ??? 250 
 MAIL FROM:<tester@test.ex>
 ??? 250


@@ -41,6 +42,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250 
 MAIL FROM:<tester2@test.ex>
 ??? 250
 ??? 250 
 MAIL FROM:<tester2@test.ex>
 ??? 250


@@ -62,9 +64,11 @@ exim -DNOTDAEMON -DSERVER=server -q
 killdaemon
 #
 #
 killdaemon
 #
 #

+# This file should have been written, then removed by the debug/kill in rcpt acl

 1
 cat DIR/spool/log/serverdebuglog_1
 #
 1
 cat DIR/spool/log/serverdebuglog_1
 #

-cp DIR/spool/log/serverdebuglog_2 /dev/stderr
+# copy this file to stderr
+cat2 DIR/spool/log/serverdebuglog_2

 #
 no_msglog_check
 #
 no_msglog_check