diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2013-04-28 16:12:40 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2013-04-28 16:14:58 +0100 |
| commit | f317ffb7bbd18428ab3275ac47bf82f146f6c066 (patch) | |
| tree | 09987fc7fc846f859f53aa809ba7017af48219b9 /tests/data | |
| parent | 9ea51459520d5d8a397908b4a3fc6cc3b2d45974 (diff) | |
tests: Corrected the SMTP tests to be RFC2821 compliant
The emails that are sent to the server during these tests were
incorrectly formatted as they contained one or more LF terminated lines
rather than being CRLF terminated as per Section 2.3.7 of RFC-2821.
This wasn't a problem for the test suite as the <stdin> data matched the
<upload> data but anyone using these tests as reference would be sending
incorrect data to a server.
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/test900 | 16 | ||||
| -rw-r--r-- | tests/data/test901 | 20 | ||||
| -rw-r--r-- | tests/data/test902 | 16 | ||||
| -rw-r--r-- | tests/data/test903 | 4 | ||||
| -rw-r--r-- | tests/data/test904 | 4 | ||||
| -rw-r--r-- | tests/data/test905 | 4 | ||||
| -rw-r--r-- | tests/data/test906 | 16 | ||||
| -rw-r--r-- | tests/data/test907 | 4 | ||||
| -rw-r--r-- | tests/data/test908 | 4 |
9 files changed, 44 insertions, 44 deletions
diff --git a/tests/data/test900 b/tests/data/test900 index 2b6681b9e..e71fa94fd 100644 --- a/tests/data/test900 +++ b/tests/data/test900 @@ -20,10 +20,10 @@ smtp SMTP </name> <stdin> -From: different -To: another - -body +From: different
+To: another
+
+body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@from -T - @@ -42,10 +42,10 @@ DATA QUIT
</protocol> <upload> -From: different -To: another - -body +From: different
+To: another
+
+body
.
</upload> diff --git a/tests/data/test901 b/tests/data/test901 index 5617c6d73..cc3409990 100644 --- a/tests/data/test901 +++ b/tests/data/test901 @@ -20,16 +20,16 @@ smtp SMTP with CRLF-dot-CRLF in data </name> <stdin> -From: different -To: another - +From: different
+To: another
+
.
.
.
- -body +
+body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T - @@ -47,16 +47,16 @@ DATA QUIT
</protocol> <upload> -From: different -To: another - +From: different
+To: another
+
..
..
..
- -body +
+body
.
</upload> diff --git a/tests/data/test902 b/tests/data/test902 index 5cb920c78..c3b9fb442 100644 --- a/tests/data/test902 +++ b/tests/data/test902 @@ -26,10 +26,10 @@ smtp RFC821-only SMTP server (EHLO not supported) </name> <stdin> -From: different -To: another - -body +From: different
+To: another
+
+body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T - @@ -48,10 +48,10 @@ DATA QUIT
</protocol> <upload> -From: different -To: another - -body +From: different
+To: another
+
+body
.
</upload> diff --git a/tests/data/test903 b/tests/data/test903 index 35bac4567..defadf903 100644 --- a/tests/data/test903 +++ b/tests/data/test903 @@ -28,7 +28,7 @@ smtp SMTP plain authentication </name> <stdin> -mail body +mail body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1234 -T - @@ -48,7 +48,7 @@ DATA QUIT
</protocol> <upload> -mail body +mail body
.
</upload> diff --git a/tests/data/test904 b/tests/data/test904 index 9c32a25e0..19e6f2226 100644 --- a/tests/data/test904 +++ b/tests/data/test904 @@ -28,7 +28,7 @@ smtp SMTP login authentication </name> <stdin> -mail body +mail body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@from -u test:1234 -T - @@ -49,7 +49,7 @@ DATA QUIT
</protocol> <upload> -mail body +mail body
.
</upload> diff --git a/tests/data/test905 b/tests/data/test905 index d58361903..451a73d49 100644 --- a/tests/data/test905 +++ b/tests/data/test905 @@ -31,7 +31,7 @@ crypto SMTP CRAM-MD5 authentication </name> <stdin> -mail body +mail body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@from -u tim:tanstaaftanstaaf -T - @@ -51,7 +51,7 @@ DATA QUIT
</protocol> <upload> -mail body +mail body
.
</upload> diff --git a/tests/data/test906 b/tests/data/test906 index da196009e..80c1e7ee6 100644 --- a/tests/data/test906 +++ b/tests/data/test906 @@ -20,10 +20,10 @@ smtp SMTP without --mail-from </name> <stdin> -From: different -To: another - -body +From: different
+To: another
+
+body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@foo -T - @@ -41,10 +41,10 @@ DATA QUIT
</protocol> <upload> -From: different -To: another - -body +From: different
+To: another
+
+body
.
</upload> diff --git a/tests/data/test907 b/tests/data/test907 index f86bc8dca..45e453db0 100644 --- a/tests/data/test907 +++ b/tests/data/test907 @@ -27,7 +27,7 @@ smtp SMTP plain authentication with initial response </name> <stdin> -mail body +mail body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@from -u test:1234 --sasl-ir -T - @@ -46,7 +46,7 @@ DATA QUIT
</protocol> <upload> -mail body +mail body
.
</upload> diff --git a/tests/data/test908 b/tests/data/test908 index ec14d3934..c1689287f 100644 --- a/tests/data/test908 +++ b/tests/data/test908 @@ -27,7 +27,7 @@ smtp SMTP login authentication with initial response </name> <stdin> -mail body +mail body
</stdin> <command> smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@from -u test:1234 --sasl-ir -T - @@ -47,7 +47,7 @@ DATA QUIT
</protocol> <upload> -mail body +mail body
.
</upload> |