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.

diff --git a/tests/data/test800 b/tests/data/test800
index d52829272582325b8403bcb4832e028bed1d8b8d..4c5726021d765b4d5d348fba0065df12ddd2f489 100644 (file)
--- a/tests/data/test800
+++ b/tests/data/test800
@@ -30,7 +30,7 @@ imap
 IMAP FETCH
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/801/;UID=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/800/;UID=1' -u user:secret
 </command>
 </client>
 
@@ -40,7 +40,7 @@ IMAP FETCH
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
-A003 SELECT 801\r
+A003 SELECT 800\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>

diff --git a/tests/data/test850 b/tests/data/test850
index 2b7d057aa696d6cee61bddd9d7d8588d963de94e..b0d0e3dc4552c02ddd8bfccc3a09e896bd085769 100644 (file)
--- a/tests/data/test850
+++ b/tests/data/test850
@@ -30,7 +30,7 @@ pop3
 POP3 RETR
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/800 -u user:secret
+pop3://%HOSTIP:%POP3PORT/850 -u user:secret
 </command>
 </client>
 
@@ -41,7 +41,7 @@ pop3://%HOSTIP:%POP3PORT/800 -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-RETR 800\r
+RETR 850\r
 QUIT\r
 </protocol>
 </verify>

diff --git a/tests/data/test851 b/tests/data/test851
index 9027a5ab99159f4c835e45cf39b894e9940ed92e..5ebb3a09457252542031ed0cae746562beca092c 100644 (file)
--- a/tests/data/test851
+++ b/tests/data/test851
@@ -11,7 +11,7 @@ LIST
 <reply>
 <servercmd>
 # 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>
 </reply>
 
@@ -25,7 +25,7 @@ pop3
 POP3 LIST one message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/808 -l -u user:secret
+pop3://%HOSTIP:%POP3PORT/851 -l -u user:secret
 </command>
 </client>
 
@@ -36,7 +36,7 @@ pop3://%HOSTIP:%POP3PORT/808 -l -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-LIST 808\r
+LIST 851\r
 QUIT\r
 </protocol>
 </verify>

diff --git a/tests/data/test852 b/tests/data/test852
index ffa9b3331d5f90ae4d490e93984c8bf61fb03746..e07c172bcba06e123642c304d0a05a5e5ef7052c 100644 (file)
--- a/tests/data/test852
+++ b/tests/data/test852
@@ -25,7 +25,7 @@ pop3
 POP3 LIST invalid message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/809 -l -u user:secret
+pop3://%HOSTIP:%POP3PORT/852 -l -u user:secret
 </command>
 </client>
 
@@ -39,7 +39,7 @@ pop3://%HOSTIP:%POP3PORT/809 -l -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-LIST 809\r
+LIST 852\r
 QUIT\r
 </protocol>
 </verify>

diff --git a/tests/data/test855 b/tests/data/test855
index dbf40c4913b5f3320dfe7b80c0649302638cbc65..bcbdf481626f176ed7838c3ef24761a1bf21b758 100644 (file)
--- a/tests/data/test855
+++ b/tests/data/test855
@@ -25,7 +25,7 @@ pop3
 POP3 RETR invalid message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/812 -u user:secret
+pop3://%HOSTIP:%POP3PORT/855 -u user:secret
 </command>
 </client>
 
@@ -39,7 +39,7 @@ pop3://%HOSTIP:%POP3PORT/812 -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-RETR 812\r
+RETR 855\r
 QUIT\r
 </protocol>
 </verify>

diff --git a/tests/data/test856 b/tests/data/test856
index fac4aa0ef70107b61fc21176d0765d15c7e358aa..7076cf6a919a0e54620bf6e8ea8e3be4c6ed93fb 100644 (file)
--- a/tests/data/test856
+++ b/tests/data/test856
@@ -24,7 +24,7 @@ pop3
 POP3 invalid login
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/813 -u user:wrong
+pop3://%HOSTIP:%POP3PORT/856 -u user:wrong
 </command>
 </client>
 

diff --git a/tests/data/test857 b/tests/data/test857
index 261887f9bc59a80e062fc28ad83d637fc3681c36..716c49e89ebcf7d23177cb4310236607c2273414 100644 (file)
--- a/tests/data/test857
+++ b/tests/data/test857
@@ -41,7 +41,7 @@ pop3
 POP3 RETR with dot-prefixed line
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/815 -u user:secret
+pop3://%HOSTIP:%POP3PORT/857 -u user:secret
 </command>
 </client>
 
@@ -52,7 +52,7 @@ pop3://%HOSTIP:%POP3PORT/815 -u user:secret
 CAPA\r
 USER user\r
 PASS secret\r
-RETR 815\r
+RETR 857\r
 QUIT\r
 </protocol>
 </verify>

diff --git a/tests/data/test900 b/tests/data/test900
index 12e46c9c3c944417c97727e1d4da28479b7c26ae..2b6681b9eebbe4a6e7a163b5e312ead410e40e66 100644 (file)
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <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>
 </client>
 
@@ -35,9 +35,9 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<802@from>\r
-RCPT TO:<802@foo>\r
-RCPT TO:<802@foobar.example>\r
+MAIL FROM:<900@from>\r
+RCPT TO:<900@foo>\r
+RCPT TO:<900@foobar.example>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test901 b/tests/data/test901
index a00ed7ab6fbf0c3094f6f0e9b2102f1508d42c4b..5617c6d737c8dd9043939ff031aec3de2246c518 100644 (file)
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <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>
 </client>
 
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from '<803@from>' -T -
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<803@from>\r
-RCPT TO:<803@foo>\r
+MAIL FROM:<901@from>\r
+RCPT TO:<901@foo>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test902 b/tests/data/test902
index cfacfc64f2b35a6a4e5c070af3503be9a8daf47f..5cb920c789cd03cf80e46987efc43d557f2f8383 100644 (file)
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <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>
 </client>
 
@@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T -
 <protocol>
 EHLO user\r
 HELO user\r
-MAIL FROM:<804@from>\r
-RCPT TO:<804@foo>\r
+MAIL FROM:<902@from>\r
+RCPT TO:<902@foo>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test903 b/tests/data/test903
index d124e40e71e0a465bf326bd69c208ab1aaa2d212..f9f2d094901f5d4077c7ae51f86c8ab1eca5289e 100644 (file)
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -30,7 +30,7 @@ SMTP plain authentication
 mail body
 </stdin>
  <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>
 </client>
 
@@ -40,8 +40,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 805@foo --mail-from 805@from -u test:1
 <protocol>
 EHLO user\r
 AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=\r
-MAIL FROM:<805@from>\r
-RCPT TO:<805@foo>\r
+MAIL FROM:<903@from>\r
+RCPT TO:<903@foo>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test904 b/tests/data/test904
index 9d1c9881496523698dc07272cf21ab38d994d435..eaccae866802e03097bfc8dd335889a94dedd57b 100644 (file)
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -30,7 +30,7 @@ SMTP login authentication
 mail body
 </stdin>
  <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>
 </client>
 
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 806@foo --mail-from 806@from -u test:1
 EHLO user\r
 AUTH LOGIN dGVzdA==\r
 MTIzNA==\r
-MAIL FROM:<806@from>\r
-RCPT TO:<806@foo>\r
+MAIL FROM:<904@from>\r
+RCPT TO:<904@foo>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test905 b/tests/data/test905
index 4165a1553e0612591fdc2add75f6df95668e1e3e..d583619037b332cec15d84ae126308998f779b11 100644 (file)
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -34,7 +34,7 @@ SMTP CRAM-MD5 authentication
 mail body
 </stdin>
  <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>
 </client>
 
@@ -45,8 +45,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 807@foo --mail-from 807@from -u tim:ta
 EHLO user\r
 AUTH CRAM-MD5\r
 dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw\r
-MAIL FROM:<807@from>\r
-RCPT TO:<807@foo>\r
+MAIL FROM:<905@from>\r
+RCPT TO:<905@foo>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test906 b/tests/data/test906
index 1fc060777962298712716512bed626c199563bf6..da196009e0d6be902ef54c115c789e1bf4169b8e 100644 (file)
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@foo -T -
 </command>
 </client>
 
@@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T -
 <protocol>
 EHLO user\r
 MAIL FROM:<>\r
-RCPT TO:<814@foo>\r
+RCPT TO:<906@foo>\r
 DATA\r
 QUIT\r
 </protocol>