tests: Tidy up of SMTP and POP3 tests

Corrected line endings, RFC references and standardised on user names
and passwords used in the tests.

11 files changed, 24 insertions, 21 deletions

diff --git a/tests/data/test856 b/tests/data/test856
index 55991c7b6..ae089d191 100644
--- a/tests/data/test856
+++ b/tests/data/test856
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 POP3
-LOGIN

+LOGIN
 FAILURE
 </keywords>
 </info>
diff --git a/tests/data/test858 b/tests/data/test858
index 05477efb2..0c7b3b748 100644
--- a/tests/data/test858
+++ b/tests/data/test858
@@ -3,7 +3,7 @@
 <keywords>
 POP3
 DELE
-CUSTOMREQUEST

+CUSTOMREQUEST
 </keywords>
 </info>
 
diff --git a/tests/data/test859 b/tests/data/test859
index f038b5c68..b85ba1f90 100644
--- a/tests/data/test859
+++ b/tests/data/test859
@@ -3,7 +3,7 @@
 <keywords>
 POP3
 STAT
-CUSTOMREQUEST

+CUSTOMREQUEST
 </keywords>
 </info>
 
diff --git a/tests/data/test860 b/tests/data/test860
index fc8b252c9..46a1b9a72 100644
--- a/tests/data/test860
+++ b/tests/data/test860
@@ -3,7 +3,7 @@
 <keywords>
 POP3
 NOOP
-CUSTOMREQUEST

+CUSTOMREQUEST
 </keywords>
 </info>
 
diff --git a/tests/data/test861 b/tests/data/test861
index 0a6917615..ee86d82c2 100644
--- a/tests/data/test861
+++ b/tests/data/test861
@@ -3,7 +3,8 @@
 <keywords>
 POP3
 UIDL
-CUSTOMREQUEST

+CUSTOMREQUEST
+RFC2449
 </keywords>
 </info>
 
diff --git a/tests/data/test862 b/tests/data/test862
index debba4df7..140a064b5 100644
--- a/tests/data/test862
+++ b/tests/data/test862
@@ -3,7 +3,8 @@
 <keywords>
 POP3
 TOP
-CUSTOMREQUEST

+CUSTOMREQUEST
+RFC2449
 </keywords>
 </info>
 
diff --git a/tests/data/test903 b/tests/data/test903
index 8c0e90fa9..7c23661d4 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -14,7 +14,7 @@ RFC4954
 <servercmd>
 AUTH PLAIN
 REPLY AUTH 334 PLAIN supported
-REPLY dGVzdAB0ZXN0ADEyMzQ= 235 Authenticated

+REPLY dXNlcgB1c2VyAHNlY3JldA== 235 Authenticated
 </servercmd>
 </reply>
 
@@ -31,7 +31,7 @@ SMTP plain authentication
 mail body

 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sende
 <protocol>
 EHLO 903

 AUTH PLAIN

-dGVzdAB0ZXN0ADEyMzQ=

+dXNlcgB1c2VyAHNlY3JldA==

 MAIL FROM:<sender@example.com>

 RCPT TO:<recipient@example.com>

 DATA

diff --git a/tests/data/test904 b/tests/data/test904
index dd7f53386..2c90cea97 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -12,9 +12,9 @@ RFC4954
 <reply>
 <servercmd>
 AUTH LOGIN
-REPLY AUTH 334 LOGIN supported

-REPLY dGVzdA== 334 UGFzc3dvcmQ6
-REPLY MTIzNA== 235 Authenticated
+REPLY AUTH 334 LOGIN supported
+REPLY dXNlcg== 334 UGFzc3dvcmQ6
+REPLY c2VjcmV0 235 Authenticated
 </servercmd>
 </reply>
 
@@ -31,7 +31,7 @@ SMTP login authentication
 mail body

 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sende
 <protocol>
 EHLO 904

 AUTH LOGIN

-dGVzdA==

-MTIzNA==

+dXNlcg==

+c2VjcmV0

 MAIL FROM:<sender@example.com>

 RCPT TO:<recipient@example.com>

 DATA

diff --git a/tests/data/test906 b/tests/data/test906
index 6cf6bedbf..4b0f2a854 100644
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -3,6 +3,7 @@
 <keywords>
 SMTP
 SMTP AUTH NTLM
+RFC4954
 </keywords>
 </info>
 
diff --git a/tests/data/test919 b/tests/data/test919
index bc26fef55..22508ab28 100644
--- a/tests/data/test919
+++ b/tests/data/test919
@@ -30,7 +30,7 @@ SMTP plain authentication with initial response
 mail body

 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>
 
@@ -39,7 +39,7 @@ smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sende
 <verify>
 <protocol>
 EHLO 919

-AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=

+AUTH PLAIN dXNlcgB1c2VyAHNlY3JldA==

 MAIL FROM:<sender@example.com>

 RCPT TO:<recipient@example.com>

 DATA

diff --git a/tests/data/test920 b/tests/data/test920
index 8502215e2..74f05a9cc 100644
--- a/tests/data/test920
+++ b/tests/data/test920
@@ -13,7 +13,7 @@ RFC4954
 <servercmd>
 AUTH LOGIN
 REPLY AUTH 334 UGFzc3dvcmQ6
-REPLY MTIzNA== 235 Authenticated
+REPLY c2VjcmV0 235 Authenticated
 </servercmd>
 </reply>
 
@@ -30,7 +30,7 @@ SMTP login authentication with initial response
 mail body

 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>
 
@@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sende
 <verify>
 <protocol>
 EHLO 920

-AUTH LOGIN dGVzdA==

-MTIzNA==

+AUTH LOGIN dXNlcg==

+c2VjcmV0

 MAIL FROM:<sender@example.com>

 RCPT TO:<recipient@example.com>

 DATA