X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ba97ac87b13f2f7380621ca998174b25cc7b2532..2c3ac6dd18dbf1f048a7054a85879dbf90c1e7f4:/test/scripts/0000-Basic/0618?ds=inline diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618 index f841177a0..d43d13ca6 100644 --- a/test/scripts/0000-Basic/0618 +++ b/test/scripts/0000-Basic/0618 @@ -1,142 +1,57 @@ -# DSN ESMTP extension RCPT options +# free of local_part_data, domain_data, sender_data # -# Server does not advertise by default -exim -DSERVER=server -bd -oX PORT_D -**** -client 127.0.0.1 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250 HELP -**** -killdaemon -# -# -# Server does advertise when told. Client requests no bounces, and this one gets a reject. -exim -DSERVER=server -DOPT=y -bd -oX PORT_D -**** -exim -z rej/never -**** -client HOSTIPV4 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM: -??? 250 -RCPT TO: NOTIFY=foo -??? 501 -RCPT TO: NOTIFY=never -??? 250 +exim -bh 99.99.99.99 +HELO tester +MAIL FROM: +RCPT TO: DATA -??? 354 -Subject: test . -??? 250 -QUIT -??? 221 -**** -exim -q -**** -# -# Client requests delivery notification; the server supports DSN so takes responsibility -exim -z accept/success -**** -client HOSTIPV4 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM: -??? 250 -RCPT TO: NOTIFY=success -??? 250 +RSET +MAIL FROM: +RCPT TO: DATA -??? 354 -Subject: test . -??? 250 QUIT -??? 221 -**** -# MSA send msg to MDA -exim -q -**** -# deliver msg at MDA -exim -q -**** -# deliver notification 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. Later, after a sleep, we will -# try again. -exim -z defer/delay +# +exim -bd -DSERVER=server -oX PORT_D **** -client HOSTIPV4 PORT_D +client 127.0.0.1 PORT_D ??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM: +HELO tester ??? 250 -RCPT TO: NOTIFY=delay +MAIL FROM: +??? 250 +RCPT TO: ??? 250 DATA ??? 354 -Subject: test . ??? 250 -QUIT -??? 221 -**** -exim -q -**** -# -# Clients requests no DSNs, and this one gets deferred -exim -z defer/never -**** -client HOSTIPV4 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM: +RSET +??? 250 +MAIL FROM: ??? 250 -RCPT TO: NOTIFY=never +RCPT TO: ??? 250 DATA ??? 354 -Subject: test . ??? 250 QUIT -??? 221 **** -exim -q -**** -sleep 3 -# +killdaemon # # -# Second time, for the queued deferrals. -# We should see the notify for c@dump.ex but not d@dump.ex -exim -z playout -**** -exim -q +exim -bs +HELO tester +MAIL FROM: +RCPT TO: +DATA +. +QUIT **** -killdaemon # # no_msglog_check