diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/log/0559 | 2 | ||||
| -rw-r--r-- | test/log/2029 | 2 | ||||
| -rw-r--r-- | test/log/2150 | 2 | ||||
| -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 | ||||
| -rw-r--r-- | test/stdout/0300 | 3 | ||||
| -rw-r--r-- | test/stdout/0301 | 3 | ||||
| -rw-r--r-- | test/stdout/0559 | 24 | ||||
| -rw-r--r-- | test/stdout/2029 | 32 | ||||
| -rw-r--r-- | test/stdout/2150 | 32 |
13 files changed, 4 insertions, 178 deletions
diff --git a/test/log/0559 b/test/log/0559 index 077691e95..fcae1cf93 100644 --- a/test/log/0559 +++ b/test/log/0559 @@ -1,4 +1,2 @@ 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=(abcd) [127.0.0.1] P=esmtp -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 Synchronization error (data after final dot) H=(abcd) [127.0.0.1] P=esmtp diff --git a/test/log/2029 b/test/log/2029 index 737b6977b..0e16a7b24 100644 --- a/test/log/2029 +++ b/test/log/2029 @@ -1,5 +1,3 @@ 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 1999-03-02 09:44:33 10HmaX-0005vi-00 TLS recv error on connection from [127.0.0.1]: A TLS packet with unexpected length was received. 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=[127.0.0.1] P=smtps -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 Synchronization error (data after final dot) H=[127.0.0.1] P=smtps diff --git a/test/log/2150 b/test/log/2150 index 41ada4435..01c430781 100644 --- a/test/log/2150 +++ b/test/log/2150 @@ -1,4 +1,2 @@ 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=[127.0.0.1] P=smtps -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 Synchronization error (data after final dot) H=[127.0.0.1] P=smtps 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 diff --git a/test/stdout/0300 b/test/stdout/0300 index 8dd5a3cc1..a41df39d3 100644 --- a/test/stdout/0300 +++ b/test/stdout/0300 @@ -27,9 +27,8 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 354 <<< 354 Enter message, ending with "." on a line by itself >>> 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 OK id=10HmaX-0005vi-00 diff --git a/test/stdout/0301 b/test/stdout/0301 index 964f0c17b..198962d06 100644 --- a/test/stdout/0301 +++ b/test/stdout/0301 @@ -36,10 +36,9 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 354 <<< 354 Enter message, ending with "." on a line by itself >>> the message ->>> . +>>> .\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message ??? 250 <<< 250 OK id=10HmaX-0005vi-00 ->>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message ??? 250 <<< 250 OK ??? 250 diff --git a/test/stdout/0559 b/test/stdout/0559 index eee1b2e43..71f5c4541 100644 --- a/test/stdout/0559 +++ b/test/stdout/0559 @@ -21,27 +21,3 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> . +++ 1 End of script -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo abcd -??? 250- -<<< 250-myhost.test.ex Hello abcd [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-PIPELINING -??? 250 -<<< 250 HELP ->>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata -??? 250 -<<< 250 OK -??? 250 -<<< 250 Accepted -??? 354 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test message. ->>> .\r\nrset -??? 550 -<<< 550 Synchronization error (data after final dot) -End of script diff --git a/test/stdout/2029 b/test/stdout/2029 index dd1bdaef8..1efa5cd7c 100644 --- a/test/stdout/2029 +++ b/test/stdout/2029 @@ -30,35 +30,3 @@ Succeeded in starting TLS >>> . +++ 1 End of script -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo abcd -??? 250- -<<< 250-myhost.test.ex Hello abcd [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> data -??? 354 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test message. ->>> .\r\nrset -+++ 1 -End of script diff --git a/test/stdout/2150 b/test/stdout/2150 index dd1bdaef8..1efa5cd7c 100644 --- a/test/stdout/2150 +++ b/test/stdout/2150 @@ -30,35 +30,3 @@ Succeeded in starting TLS >>> . +++ 1 End of script -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo abcd -??? 250- -<<< 250-myhost.test.ex Hello abcd [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> data -??? 354 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test message. ->>> .\r\nrset -+++ 1 -End of script |