appendfile: tidying

[users/jgh/exim.git] / test / scripts / 5500-PRDR / 5500

diff --git a/test/scripts/5500-PRDR/5500 b/test/scripts/5500-PRDR/5500
index fec0701a27e1e9019d757362d00ed929c4353dcc..1c6c344fe53d0895107e7cfb978443addd3db7da 100644 (file)
--- a/test/scripts/5500-PRDR/5500
+++ b/test/scripts/5500-PRDR/5500
@@ -6,7 +6,7 @@ no_msglog_check
 #    z rejected, all after data per PRDR spec
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #    z rejected, all after data per PRDR spec
 exim -DSERVER=server -bd -oX PORT_D
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -35,11 +35,11 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500

 #
 #
 # 2: traditional data acl should be called, resulting in an overall reject
 #
 #
 # 2: traditional data acl should be called, resulting in an overall reject

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -65,12 +65,12 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500

 #
 #
 # 3: PRDR should be avoided for a single-recipient message
 # even though the client showed support.
 #
 #
 # 3: PRDR should be avoided for a single-recipient message
 # even though the client showed support.

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -91,10 +91,10 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500

 #
 # 4: double temp-reject
 #
 # 4: double temp-reject

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -120,10 +120,10 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500

 #
 # 5: double reject
 #
 # 5: double reject

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -149,7 +149,31 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500
+#
+# 6: no PRDR request
+client 127.0.0.1 PORT_D
+??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-PRDR
+??? 250
+mail from:<>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+Sender: sender@some.where
+.
+??? 250
+quit
+??? 221
+****
+millisleep 500

 #
 killdaemon
 #
 #
 killdaemon
 #