Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0612 b/test/scripts/0000-Basic/0612
index 69a53c6918120cc8a7d7f7d51838c6d193228a05..f9f283dcb32c2ef794afc35108b4160a838e8971 100644 (file)
--- a/test/scripts/0000-Basic/0612
+++ b/test/scripts/0000-Basic/0612
@@ -8,6 +8,7 @@ client 127.0.0.1 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
+??? 250-LIMITS
 ??? 250 HELP
 ****
 killdaemon
@@ -23,6 +24,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
+??? 250-LIMITS
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<a@dump.ex>
@@ -50,6 +52,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
+??? 250-LIMITS
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<b@dump.ex>
@@ -74,6 +77,42 @@ exim -q
 exim -q
 ****
 #
+# Client requests delivery notification; the MSA & MDA supports DSN
+# but MDA fake-rejects msg.
+# The MDA should not send a delivery notification for this case.
+exim -z fakereject/success
+****
+client HOSTIPV4 PORT_D
+??? 220
+EHLO testclient
+??? 250-
+??? 250-SIZE
+??? 250-LIMITS
+??? 250-DSN
+??? 250 HELP
+MAIL FROM:<b2@dump.ex>
+??? 250
+RCPT TO:<rmt_fakereject@test.ex> NOTIFY=success
+??? 250
+DATA
+??? 354
+Subject: test
+.
+??? 250
+QUIT
+??? 221
+****
+# MSA (try to) send msg to MDA; should see a reject
+exim -q
+****
+# due to fake, should be a msg to deliver at MDA
+# no DSN should be generated
+exim -q
+****
+# should be no notification to deliver from MDA
+exim -q
+****
+#
 # Client requests notification of deferral.  First time of trying, we get
 # a defer but queue-time probably has not hit the 1st retry time yet, so no DSN
 # will be sent and the message remains queued.  Then, claiming time has elapsed,
@@ -86,6 +125,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
+??? 250-LIMITS
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<c@dump.ex>
@@ -111,6 +151,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
+??? 250-LIMITS
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<d@dump.ex>
@@ -151,6 +192,7 @@ client HOSTIPV4 PORT_D
 EHLO testclient
 ??? 250-
 ??? 250-SIZE
+??? 250-LIMITS
 ??? 250-DSN
 ??? 250 HELP
 MAIL FROM:<e@dump.ex>