X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1d717e1c110562fd6bf28478c79f180cafeba776..2c3ac6dd18dbf1f048a7054a85879dbf90c1e7f4:/test/scripts/0000-Basic/0618?ds=inline diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618 index 69a53c691..d43d13ca6 100644 --- a/test/scripts/0000-Basic/0618 +++ b/test/scripts/0000-Basic/0618 @@ -1,180 +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. Then, claiming time has elapsed, -# we will look again (expecting a delay-DSN to be produced). We won't see a -# retry since the actual retry time has not passed. -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 -RCPT TO: NOTIFY=never +MAIL FROM: +??? 250 +RCPT TO: ??? 250 DATA ??? 354 -Subject: test . ??? 250 QUIT -??? 221 -**** -exim -q -**** -# -# -# -# Second time, for the queued deferrals. -# We should see the notify for c@dump.ex but not d@dump.ex -exim -z playout -**** -exim -Tqt 10s/ -q **** -sleep 1 -exim -Mrm $msg1 $msg2 -**** -# -# +killdaemon # # -# Client requests bounce+delay notification; bounce happens -exim -z rej/failure+delay -**** -client HOSTIPV4 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM: -??? 250 -RCPT TO: NOTIFY=fAiLuRe,DELAY -??? 250 +exim -bs +HELO tester +MAIL FROM: +RCPT TO: DATA -??? 354 -Subject: test . -??? 250 QUIT -??? 221 -**** -# MSA send msg to MDA -exim -q **** -# deliver notification from MDA -exim -z 'deliver DSN' -**** -exim -q -**** -sleep 1 -killdaemon # # no_msglog_check