email-tests: Updated the test data that corresponds to the test number

Finished segregating the email protocol tests, into their own protocol
based ranges, in preparation of adding more e-mail related tests to the
test suite.
This commit is contained in:
Steve Holme 2013-03-10 19:55:22 +00:00
parent 5a6464ae09
commit 85e944928c
14 changed files with 35 additions and 35 deletions

View File

@ -30,7 +30,7 @@ imap
IMAP FETCH IMAP FETCH
</name> </name>
<command> <command>
'imap://%HOSTIP:%IMAPPORT/801/;UID=1' -u user:secret 'imap://%HOSTIP:%IMAPPORT/800/;UID=1' -u user:secret
</command> </command>
</client> </client>
@ -40,7 +40,7 @@ IMAP FETCH
<protocol> <protocol>
A001 CAPABILITY A001 CAPABILITY
A002 LOGIN user secret A002 LOGIN user secret
A003 SELECT 801 A003 SELECT 800
A004 FETCH 1 BODY[] A004 FETCH 1 BODY[]
A005 LOGOUT A005 LOGOUT
</protocol> </protocol>

View File

@ -30,7 +30,7 @@ pop3
POP3 RETR POP3 RETR
</name> </name>
<command> <command>
pop3://%HOSTIP:%POP3PORT/800 -u user:secret pop3://%HOSTIP:%POP3PORT/850 -u user:secret
</command> </command>
</client> </client>
@ -41,7 +41,7 @@ pop3://%HOSTIP:%POP3PORT/800 -u user:secret
CAPA CAPA
USER user USER user
PASS secret PASS secret
RETR 800 RETR 850
QUIT QUIT
</protocol> </protocol>
</verify> </verify>

View File

@ -11,7 +11,7 @@ LIST
<reply> <reply>
<servercmd> <servercmd>
# include the '.\r\n' 3-byte trailer to end the transfer poperly! # include the '.\r\n' 3-byte trailer to end the transfer poperly!
REPLY LIST +OK 808 100\r\n. REPLY LIST +OK 851 100\r\n.
</servercmd> </servercmd>
</reply> </reply>
@ -25,7 +25,7 @@ pop3
POP3 LIST one message POP3 LIST one message
</name> </name>
<command> <command>
pop3://%HOSTIP:%POP3PORT/808 -l -u user:secret pop3://%HOSTIP:%POP3PORT/851 -l -u user:secret
</command> </command>
</client> </client>
@ -36,7 +36,7 @@ pop3://%HOSTIP:%POP3PORT/808 -l -u user:secret
CAPA CAPA
USER user USER user
PASS secret PASS secret
LIST 808 LIST 851
QUIT QUIT
</protocol> </protocol>
</verify> </verify>

View File

@ -25,7 +25,7 @@ pop3
POP3 LIST invalid message POP3 LIST invalid message
</name> </name>
<command> <command>
pop3://%HOSTIP:%POP3PORT/809 -l -u user:secret pop3://%HOSTIP:%POP3PORT/852 -l -u user:secret
</command> </command>
</client> </client>
@ -39,7 +39,7 @@ pop3://%HOSTIP:%POP3PORT/809 -l -u user:secret
CAPA CAPA
USER user USER user
PASS secret PASS secret
LIST 809 LIST 852
QUIT QUIT
</protocol> </protocol>
</verify> </verify>

View File

@ -25,7 +25,7 @@ pop3
POP3 RETR invalid message POP3 RETR invalid message
</name> </name>
<command> <command>
pop3://%HOSTIP:%POP3PORT/812 -u user:secret pop3://%HOSTIP:%POP3PORT/855 -u user:secret
</command> </command>
</client> </client>
@ -39,7 +39,7 @@ pop3://%HOSTIP:%POP3PORT/812 -u user:secret
CAPA CAPA
USER user USER user
PASS secret PASS secret
RETR 812 RETR 855
QUIT QUIT
</protocol> </protocol>
</verify> </verify>

View File

@ -24,7 +24,7 @@ pop3
POP3 invalid login POP3 invalid login
</name> </name>
<command> <command>
pop3://%HOSTIP:%POP3PORT/813 -u user:wrong pop3://%HOSTIP:%POP3PORT/856 -u user:wrong
</command> </command>
</client> </client>

View File

@ -41,7 +41,7 @@ pop3
POP3 RETR with dot-prefixed line POP3 RETR with dot-prefixed line
</name> </name>
<command> <command>
pop3://%HOSTIP:%POP3PORT/815 -u user:secret pop3://%HOSTIP:%POP3PORT/857 -u user:secret
</command> </command>
</client> </client>
@ -52,7 +52,7 @@ pop3://%HOSTIP:%POP3PORT/815 -u user:secret
CAPA CAPA
USER user USER user
PASS secret PASS secret
RETR 815 RETR 857
QUIT QUIT
</protocol> </protocol>
</verify> </verify>

View File

@ -26,7 +26,7 @@ To: another
body body
</stdin> </stdin>
<command> <command>
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example --mail-from 802@from -T - smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@from -T -
</command> </command>
</client> </client>
@ -35,9 +35,9 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example
<verify> <verify>
<protocol> <protocol>
EHLO user EHLO user
MAIL FROM:<802@from> MAIL FROM:<900@from>
RCPT TO:<802@foo> RCPT TO:<900@foo>
RCPT TO:<802@foobar.example> RCPT TO:<900@foobar.example>
DATA DATA
QUIT QUIT
</protocol> </protocol>

View File

@ -32,7 +32,7 @@ To: another
body body
</stdin> </stdin>
<command> <command>
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from '<803@from>' -T - smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T -
</command> </command>
</client> </client>
@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from '<803@from>' -T -
<verify> <verify>
<protocol> <protocol>
EHLO user EHLO user
MAIL FROM:<803@from> MAIL FROM:<901@from>
RCPT TO:<803@foo> RCPT TO:<901@foo>
DATA DATA
QUIT QUIT
</protocol> </protocol>

View File

@ -32,7 +32,7 @@ To: another
body body
</stdin> </stdin>
<command> <command>
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T - smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T -
</command> </command>
</client> </client>
@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T -
<protocol> <protocol>
EHLO user EHLO user
HELO user HELO user
MAIL FROM:<804@from> MAIL FROM:<902@from>
RCPT TO:<804@foo> RCPT TO:<902@foo>
DATA DATA
QUIT QUIT
</protocol> </protocol>

View File

@ -30,7 +30,7 @@ SMTP plain authentication
mail body mail body
</stdin> </stdin>
<command> <command>
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 805@foo --mail-from 805@from -u test:1234 -T - smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1234 -T -
</command> </command>
</client> </client>
@ -40,8 +40,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 805@foo --mail-from 805@from -u test:1
<protocol> <protocol>
EHLO user EHLO user
AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ= AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
MAIL FROM:<805@from> MAIL FROM:<903@from>
RCPT TO:<805@foo> RCPT TO:<903@foo>
DATA DATA
QUIT QUIT
</protocol> </protocol>

View File

@ -30,7 +30,7 @@ SMTP login authentication
mail body mail body
</stdin> </stdin>
<command> <command>
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 806@foo --mail-from 806@from -u test:1234 -T - smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@from -u test:1234 -T -
</command> </command>
</client> </client>
@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 806@foo --mail-from 806@from -u test:1
EHLO user EHLO user
AUTH LOGIN dGVzdA== AUTH LOGIN dGVzdA==
MTIzNA== MTIzNA==
MAIL FROM:<806@from> MAIL FROM:<904@from>
RCPT TO:<806@foo> RCPT TO:<904@foo>
DATA DATA
QUIT QUIT
</protocol> </protocol>

View File

@ -34,7 +34,7 @@ SMTP CRAM-MD5 authentication
mail body mail body
</stdin> </stdin>
<command> <command>
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 807@foo --mail-from 807@from -u tim:tanstaaftanstaaf -T - smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@from -u tim:tanstaaftanstaaf -T -
</command> </command>
</client> </client>
@ -45,8 +45,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 807@foo --mail-from 807@from -u tim:ta
EHLO user EHLO user
AUTH CRAM-MD5 AUTH CRAM-MD5
dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw
MAIL FROM:<807@from> MAIL FROM:<905@from>
RCPT TO:<807@foo> RCPT TO:<905@foo>
DATA DATA
QUIT QUIT
</protocol> </protocol>

View File

@ -26,7 +26,7 @@ To: another
body body
</stdin> </stdin>
<command> <command>
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T - smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@foo -T -
</command> </command>
</client> </client>
@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T -
<protocol> <protocol>
EHLO user EHLO user
MAIL FROM:<> MAIL FROM:<>
RCPT TO:<814@foo> RCPT TO:<906@foo>
DATA DATA
QUIT QUIT
</protocol> </protocol>