testsuite: reproduce BDAT with missing eol (Bug 1974)

(cherry picked from commit e9cecc465a570c1a4f34b199eae6bdd0a52ee2b0)

diff --git a/test/log/0900 b/test/log/0900
index a6e10636786ea45308dfca70d77356ffca3eff3d..85ba6d730a2f9a5740bcc5c67cab5698123c185b 100644 (file)
--- a/test/log/0900
+++ b/test/log/0900
@@ -10,3 +10,4 @@
 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
 2017-07-30 18:51:05.712 H=(tester) [127.0.0.1] F=<someone@some.domain> rejected RCPT <dummy@reject.ex>: relay not permitted
 2017-07-30 18:51:05.712 rejected from <someone@some.domain> H=(tester) [127.0.0.1]: Non-CRLF-terminated header, under CHUNKING: message abandoned
 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
 2017-07-30 18:51:05.712 H=(tester) [127.0.0.1] F=<someone@some.domain> rejected RCPT <dummy@reject.ex>: relay not permitted
 2017-07-30 18:51:05.712 rejected from <someone@some.domain> H=(tester) [127.0.0.1]: Non-CRLF-terminated header, under CHUNKING: message abandoned

+2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex

diff --git a/test/scripts/0000-Basic/0900 b/test/scripts/0000-Basic/0900
index 4503ae0c01b9419212bd4cc6f47cca9456878d9b..1c0e43552eb160d5d90a5b0e71c085e4dec5b232 100644 (file)
--- a/test/scripts/0000-Basic/0900
+++ b/test/scripts/0000-Basic/0900
@@ -38,7 +38,7 @@ ehlo tester
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

-??? 250 
+??? 250

 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex
 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex


@@ -82,7 +82,7 @@ ehlo tester
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

-??? 250 
+??? 250

 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex
 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex


@@ -105,7 +105,7 @@ ehlo tester
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

-??? 250 
+??? 250

 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex
 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex


@@ -131,7 +131,7 @@ ehlo tester
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

-??? 250 
+??? 250

 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex
 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex


@@ -152,7 +152,7 @@ EHLO tester
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

-??? 250 
+??? 250

 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex
 mail from:someone@some.domain
 ??? 250
 rcpt to:CALLER@test.ex


@@ -240,6 +240,32 @@ quit
 ??? 221
 ****
 #
 ??? 221
 ****
 #

+# plain, small message (body w/o lineend)
+client 127.0.0.1 PORT_D
+??? 220
+ehlo tester
+??? 250-
+??? 250-SIZE
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250-CHUNKING
+??? 250 HELP
+mail from:someone@some.domain
+??? 250
+rcpt to:CALLER@test.ex
+??? 250
+bdat 98 last
+To: Susan@random.com
+From: Sam@random.com
+Subject: This is a bodyfull test message
+
+>>> 1234567890
+??? 250-
+??? 250
+quit
+??? 221
+****
+#

 #
 killdaemon
 no_msglog_check
 #
 killdaemon
 no_msglog_check

diff --git a/test/stdout/0900 b/test/stdout/0900
index 72269fad92bff079a58e4f3a81b4162ac2a17e99..ccd10f0a1b68d3e9ab70d6799f9a69b6cdcfa2c2 100644 (file)
--- a/test/stdout/0900
+++ b/test/stdout/0900
@@ -47,7 +47,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING

-??? 250 
+??? 250

 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250


@@ -107,7 +107,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING

-??? 250 
+??? 250

 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250


@@ -137,7 +137,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING

-??? 250 
+??? 250

 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250


@@ -173,7 +173,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING

-??? 250 
+??? 250

 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250


@@ -205,7 +205,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING

-??? 250 
+??? 250

 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 HELP
 >>> mail from:someone@some.domain
 ??? 250


@@ -329,3 +329,39 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 221
 <<< 221 testhost.test.ex closing connection
 End of script
 ??? 221
 <<< 221 testhost.test.ex closing connection
 End of script

+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo tester
+??? 250-
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
+??? 250-SIZE
+<<< 250-SIZE 52428800
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
+<<< 250-PIPELINING
+??? 250-CHUNKING
+<<< 250-CHUNKING
+??? 250 HELP
+<<< 250 HELP
+>>> mail from:someone@some.domain
+??? 250
+<<< 250 OK
+>>> rcpt to:CALLER@test.ex
+??? 250
+<<< 250 Accepted
+>>> bdat 98 last
+>>> To: Susan@random.com
+>>> From: Sam@random.com
+>>> Subject: This is a bodyfull test message
+>>> 
+>>> 1234567890
+??? 250-
+<<< 250- 98 byte chunk, total 100
+??? 250
+<<< 250 OK id=10HmbC-0005vi-00
+>>> quit
+??? 221
+<<< 221 testhost.test.ex closing connection
+End of script