From fb327e42c676e2757d50b56486fbdbdef589b2ef Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 10 Mar 2013 18:48:08 +0000 Subject: email-tests: Renamed the SMTP tests to be in the range 900-906 Continued segregating the email protocol tests, into their own protocol based ranges, in preparation of adding more e-mail related tests to the test suite. --- tests/data/Makefile.am | 3 ++- tests/data/test802 | 53 ----------------------------------------- tests/data/test803 | 64 -------------------------------------------------- tests/data/test804 | 59 ---------------------------------------------- tests/data/test805 | 54 ------------------------------------------ tests/data/test806 | 55 ------------------------------------------- tests/data/test807 | 59 ---------------------------------------------- tests/data/test814 | 52 ---------------------------------------- tests/data/test900 | 53 +++++++++++++++++++++++++++++++++++++++++ tests/data/test901 | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test902 | 59 ++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test903 | 54 ++++++++++++++++++++++++++++++++++++++++++ tests/data/test904 | 55 +++++++++++++++++++++++++++++++++++++++++++ tests/data/test905 | 59 ++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test906 | 52 ++++++++++++++++++++++++++++++++++++++++ 15 files changed, 398 insertions(+), 397 deletions(-) delete mode 100644 tests/data/test802 delete mode 100644 tests/data/test803 delete mode 100644 tests/data/test804 delete mode 100644 tests/data/test805 delete mode 100644 tests/data/test806 delete mode 100644 tests/data/test807 delete mode 100644 tests/data/test814 create mode 100644 tests/data/test900 create mode 100644 tests/data/test901 create mode 100644 tests/data/test902 create mode 100644 tests/data/test903 create mode 100644 tests/data/test904 create mode 100644 tests/data/test905 create mode 100644 tests/data/test906 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 8a81dd09c..1f772d32f 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -56,8 +56,9 @@ test623 test624 test625 test626 test627 test628 test629 test630 test631 \ test632 test633 test634 test635 test636 test637 test638 test639 \ test700 test701 test702 test703 test704 test705 test706 test707 test708 \ test709 test710 \ -test801 test802 test803 test804 test805 test806 test807 test814 \ +test801 \ test850 test851 test852 test853 test854 test855 test856 test857 \ +test900 test901 test902 test903 test904 test905 test906 \ test1000 test1001 test1002 test1003 test1004 test1005 \ test1006 test1007 test1008 test1009 test1010 test1011 test1012 test1013 \ test1014 test1015 test1016 test1017 test1018 test1019 test1020 test1021 \ diff --git a/tests/data/test802 b/tests/data/test802 deleted file mode 100644 index 12e46c9c3..000000000 --- a/tests/data/test802 +++ /dev/null @@ -1,53 +0,0 @@ - - - -SMTP - - - -# -# Server-side - - - -# -# Client-side - - -smtp - - -SMTP - - -From: different -To: another - -body - - -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example --mail-from 802@from -T - - - - -# -# Verify data after the test has been "shot" - - -EHLO user -MAIL FROM:<802@from> -RCPT TO:<802@foo> -RCPT TO:<802@foobar.example> -DATA -QUIT - - -From: different -To: another - -body - -. - - - diff --git a/tests/data/test803 b/tests/data/test803 deleted file mode 100644 index a00ed7ab6..000000000 --- a/tests/data/test803 +++ /dev/null @@ -1,64 +0,0 @@ - - - -SMTP - - - -# -# Server-side - - - -# -# Client-side - - -smtp - - -SMTP with CRLF-dot-CRLF in data - - -From: different -To: another - - -. -. - -. - -body - - -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from '<803@from>' -T - - - - -# -# Verify data after the test has been "shot" - - -EHLO user -MAIL FROM:<803@from> -RCPT TO:<803@foo> -DATA -QUIT - - -From: different -To: another - - -.. -.. - -.. - -body - -. - - - diff --git a/tests/data/test804 b/tests/data/test804 deleted file mode 100644 index cfacfc64f..000000000 --- a/tests/data/test804 +++ /dev/null @@ -1,59 +0,0 @@ - - - -SMTP -SMTP HELO -RFC821 - - - -# -# Server-side - - -REPLY EHLO 500 Command unrecognized -REPLY HELO 250 Already old but still servicing... - - - -# -# Client-side - - -smtp - - -RFC821-only SMTP server (EHLO not supported) - - -From: different -To: another - -body - - -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T - - - - -# -# Verify data after the test has been "shot" - - -EHLO user -HELO user -MAIL FROM:<804@from> -RCPT TO:<804@foo> -DATA -QUIT - - -From: different -To: another - -body - -. - - - diff --git a/tests/data/test805 b/tests/data/test805 deleted file mode 100644 index d124e40e7..000000000 --- a/tests/data/test805 +++ /dev/null @@ -1,54 +0,0 @@ - - - -SMTP -SMTP AUTH PLAIN -RFC4616 -RFC4954 - - - -# -# Server-side - - -REPLY EHLO 250 AUTH PLAIN -REPLY AUTH 235 Authenticated - - - -# -# Client-side - - -smtp - - -SMTP plain authentication - - -mail body - - -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 805@foo --mail-from 805@from -u test:1234 -T - - - - -# -# Verify data after the test has been "shot" - - -EHLO user -AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ= -MAIL FROM:<805@from> -RCPT TO:<805@foo> -DATA -QUIT - - -mail body - -. - - - diff --git a/tests/data/test806 b/tests/data/test806 deleted file mode 100644 index 9d1c98814..000000000 --- a/tests/data/test806 +++ /dev/null @@ -1,55 +0,0 @@ - - - -SMTP -SMTP AUTH LOGIN -RFC4954 - - - -# -# Server-side - - -REPLY EHLO 250 AUTH LOGIN -REPLY AUTH 334 UGFzc3dvcmQ6 -REPLY MTIzNA== 235 Authenticated - - - -# -# Client-side - - -smtp - - -SMTP login authentication - - -mail body - - -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 806@foo --mail-from 806@from -u test:1234 -T - - - - -# -# Verify data after the test has been "shot" - - -EHLO user -AUTH LOGIN dGVzdA== -MTIzNA== -MAIL FROM:<806@from> -RCPT TO:<806@foo> -DATA -QUIT - - -mail body - -. - - - diff --git a/tests/data/test807 b/tests/data/test807 deleted file mode 100644 index 4165a1553..000000000 --- a/tests/data/test807 +++ /dev/null @@ -1,59 +0,0 @@ - - - -SMTP -SMTP AUTH CRAM-MD5 -RFC2195 -RFC4954 - - - -# -# Server-side - - -REPLY EHLO 250 AUTH CRAM-MD5 -REPLY AUTH 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ -REPLY dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw 235 Authenticated - - - -# -# Client-side - - -smtp - - -crypto - - -SMTP CRAM-MD5 authentication - - -mail body - - -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 807@foo --mail-from 807@from -u tim:tanstaaftanstaaf -T - - - - -# -# Verify data after the test has been "shot" - - -EHLO user -AUTH CRAM-MD5 -dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw -MAIL FROM:<807@from> -RCPT TO:<807@foo> -DATA -QUIT - - -mail body - -. - - - diff --git a/tests/data/test814 b/tests/data/test814 deleted file mode 100644 index 1fc060777..000000000 --- a/tests/data/test814 +++ /dev/null @@ -1,52 +0,0 @@ - - - -SMTP - - - -# -# Server-side - - - -# -# Client-side - - -smtp - - -SMTP without --mail-from - - -From: different -To: another - -body - - -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T - - - - -# -# Verify data after the test has been "shot" - - -EHLO user -MAIL FROM:<> -RCPT TO:<814@foo> -DATA -QUIT - - -From: different -To: another - -body - -. - - - diff --git a/tests/data/test900 b/tests/data/test900 new file mode 100644 index 000000000..12e46c9c3 --- /dev/null +++ b/tests/data/test900 @@ -0,0 +1,53 @@ + + + +SMTP + + + +# +# Server-side + + + +# +# Client-side + + +smtp + + +SMTP + + +From: different +To: another + +body + + +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example --mail-from 802@from -T - + + + +# +# Verify data after the test has been "shot" + + +EHLO user +MAIL FROM:<802@from> +RCPT TO:<802@foo> +RCPT TO:<802@foobar.example> +DATA +QUIT + + +From: different +To: another + +body + +. + + + diff --git a/tests/data/test901 b/tests/data/test901 new file mode 100644 index 000000000..a00ed7ab6 --- /dev/null +++ b/tests/data/test901 @@ -0,0 +1,64 @@ + + + +SMTP + + + +# +# Server-side + + + +# +# Client-side + + +smtp + + +SMTP with CRLF-dot-CRLF in data + + +From: different +To: another + + +. +. + +. + +body + + +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from '<803@from>' -T - + + + +# +# Verify data after the test has been "shot" + + +EHLO user +MAIL FROM:<803@from> +RCPT TO:<803@foo> +DATA +QUIT + + +From: different +To: another + + +.. +.. + +.. + +body + +. + + + diff --git a/tests/data/test902 b/tests/data/test902 new file mode 100644 index 000000000..cfacfc64f --- /dev/null +++ b/tests/data/test902 @@ -0,0 +1,59 @@ + + + +SMTP +SMTP HELO +RFC821 + + + +# +# Server-side + + +REPLY EHLO 500 Command unrecognized +REPLY HELO 250 Already old but still servicing... + + + +# +# Client-side + + +smtp + + +RFC821-only SMTP server (EHLO not supported) + + +From: different +To: another + +body + + +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T - + + + +# +# Verify data after the test has been "shot" + + +EHLO user +HELO user +MAIL FROM:<804@from> +RCPT TO:<804@foo> +DATA +QUIT + + +From: different +To: another + +body + +. + + + diff --git a/tests/data/test903 b/tests/data/test903 new file mode 100644 index 000000000..d124e40e7 --- /dev/null +++ b/tests/data/test903 @@ -0,0 +1,54 @@ + + + +SMTP +SMTP AUTH PLAIN +RFC4616 +RFC4954 + + + +# +# Server-side + + +REPLY EHLO 250 AUTH PLAIN +REPLY AUTH 235 Authenticated + + + +# +# Client-side + + +smtp + + +SMTP plain authentication + + +mail body + + +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 805@foo --mail-from 805@from -u test:1234 -T - + + + +# +# Verify data after the test has been "shot" + + +EHLO user +AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ= +MAIL FROM:<805@from> +RCPT TO:<805@foo> +DATA +QUIT + + +mail body + +. + + + diff --git a/tests/data/test904 b/tests/data/test904 new file mode 100644 index 000000000..9d1c98814 --- /dev/null +++ b/tests/data/test904 @@ -0,0 +1,55 @@ + + + +SMTP +SMTP AUTH LOGIN +RFC4954 + + + +# +# Server-side + + +REPLY EHLO 250 AUTH LOGIN +REPLY AUTH 334 UGFzc3dvcmQ6 +REPLY MTIzNA== 235 Authenticated + + + +# +# Client-side + + +smtp + + +SMTP login authentication + + +mail body + + +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 806@foo --mail-from 806@from -u test:1234 -T - + + + +# +# Verify data after the test has been "shot" + + +EHLO user +AUTH LOGIN dGVzdA== +MTIzNA== +MAIL FROM:<806@from> +RCPT TO:<806@foo> +DATA +QUIT + + +mail body + +. + + + diff --git a/tests/data/test905 b/tests/data/test905 new file mode 100644 index 000000000..4165a1553 --- /dev/null +++ b/tests/data/test905 @@ -0,0 +1,59 @@ + + + +SMTP +SMTP AUTH CRAM-MD5 +RFC2195 +RFC4954 + + + +# +# Server-side + + +REPLY EHLO 250 AUTH CRAM-MD5 +REPLY AUTH 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ +REPLY dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw 235 Authenticated + + + +# +# Client-side + + +smtp + + +crypto + + +SMTP CRAM-MD5 authentication + + +mail body + + +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 807@foo --mail-from 807@from -u tim:tanstaaftanstaaf -T - + + + +# +# Verify data after the test has been "shot" + + +EHLO user +AUTH CRAM-MD5 +dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw +MAIL FROM:<807@from> +RCPT TO:<807@foo> +DATA +QUIT + + +mail body + +. + + + diff --git a/tests/data/test906 b/tests/data/test906 new file mode 100644 index 000000000..1fc060777 --- /dev/null +++ b/tests/data/test906 @@ -0,0 +1,52 @@ + + + +SMTP + + + +# +# Server-side + + + +# +# Client-side + + +smtp + + +SMTP without --mail-from + + +From: different +To: another + +body + + +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T - + + + +# +# Verify data after the test has been "shot" + + +EHLO user +MAIL FROM:<> +RCPT TO:<814@foo> +DATA +QUIT + + +From: different +To: another + +body + +. + + + -- cgit v1.2.3