diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-04-16 10:31:58 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-04-16 10:31:58 +0000 |
| commit | 563b63fa3e09d67239f51483e5dcec5c91251522 (patch) | |
| tree | 39c50ba6ecad3e86c0b1a5676ad1d935e9beda73 /test/scripts | |
| parent | 58eb016e585187a87ade7602b2aecb2208605320 (diff) | |
Fix bug in previous patch: following data is permitted after '.' so it
must not be diagnosed as an error. The check for vanished socket can
only be applied when there is no data pending.
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/0000-Basic/0300 | 3 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0301 | 3 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0559 | 22 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2029 | 27 | ||||
| -rw-r--r-- | test/scripts/2100-OpenSSL/2150 | 27 |
5 files changed, 2 insertions, 80 deletions
diff --git a/test/scripts/0000-Basic/0300 b/test/scripts/0000-Basic/0300 index de3be1095..053aec804 100644 --- a/test/scripts/0000-Basic/0300 +++ b/test/scripts/0000-Basic/0300 @@ -23,9 +23,8 @@ rset\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata ??? 250 ??? 354 the message -. +.\r\nmail from:<userx@test.ex> +++ 1 -mail from:<userx@test.ex> rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line ??? 250 ??? 250 diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301 index f84244f05..4add8f42c 100644 --- a/test/scripts/0000-Basic/0301 +++ b/test/scripts/0000-Basic/0301 @@ -26,9 +26,8 @@ mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata ??? 250 ??? 354 the message -. +.\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message ??? 250 -mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message ??? 250 ??? 250 ??? 354 diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559 index 01d7d99af..3729f25ab 100644 --- a/test/scripts/0000-Basic/0559 +++ b/test/scripts/0000-Basic/0559 @@ -20,25 +20,3 @@ This is a test message. **** sleep 1 killdaemon -# -# Also check for next input sent too soon -# -exim -DSERVER=server -bd -oX PORT_D -**** -client -t5 127.0.0.1 PORT_D -??? 220 -ehlo abcd -??? 250- -??? 250- -??? 250- -??? 250 -mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata -??? 250 -??? 250 -??? 354 -This is a test message. -.\r\nrset -??? 550 -**** -sleep 1 -killdaemon diff --git a/test/scripts/2000-GnuTLS/2029 b/test/scripts/2000-GnuTLS/2029 index e371e68d7..c2b35497b 100644 --- a/test/scripts/2000-GnuTLS/2029 +++ b/test/scripts/2000-GnuTLS/2029 @@ -28,30 +28,3 @@ This is a test message. **** sleep 1 killdaemon -# -# Also check for next input sent too soon -# -exim -DSERVER=server -bd -oX PORT_D -**** -client-gnutls 127.0.0.1 PORT_D -??? 220 -ehlo abcd -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -mail from:<userx@test.ex> -??? 250 -rcpt to:<userx@test.ex> -??? 250 -data -??? 354 -This is a test message. -.\r\nrset -+++ 1 -**** -sleep 1 -killdaemon diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150 index cfc6a20d7..91cd38276 100644 --- a/test/scripts/2100-OpenSSL/2150 +++ b/test/scripts/2100-OpenSSL/2150 @@ -26,30 +26,3 @@ This is a test message. **** sleep 1 killdaemon -# -# Also check for next input sent too soon -# -exim -DSERVER=server -bd -oX PORT_D -**** -client-gnutls 127.0.0.1 PORT_D -??? 220 -ehlo abcd -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -mail from:<userx@test.ex> -??? 250 -rcpt to:<userx@test.ex> -??? 250 -data -??? 354 -This is a test message. -.\r\nrset -+++ 1 -**** -sleep 1 -killdaemon |