tests: Updated SMTP tests to decouple client initial response

Updated test903 and test904 following the addition of CURLOPT_SASL_IR
as the default behaviour of SMTP AUTH responses is now to not include
the initial response. New tests with --sasl-ir support to follow.

diff --git a/tests/data/test903 b/tests/data/test903
index f9f2d094901f5d4077c7ae51f86c8ab1eca5289e..35bac4567a160cd346b1b206e765950e70d22be1 100644 (file)
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -13,7 +13,8 @@ RFC4954
 <reply>
 <servercmd>
 REPLY EHLO 250 AUTH PLAIN
-REPLY AUTH 235 Authenticated
+REPLY AUTH 334 PLAIN supported
+REPLY dGVzdAB0ZXN0ADEyMzQ= 235 Authenticated\r
 </servercmd>
 </reply>
 
@@ -39,7 +40,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1
 <verify>
 <protocol>
 EHLO user\r
-AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=\r
+AUTH PLAIN\r
+dGVzdAB0ZXN0ADEyMzQ=\r
 MAIL FROM:<903@from>\r
 RCPT TO:<903@foo>\r
 DATA\r

diff --git a/tests/data/test904 b/tests/data/test904
index eaccae866802e03097bfc8dd335889a94dedd57b..9c32a25e0afc7d27c11a4b5ffeff6843faf21704 100644 (file)
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -12,7 +12,8 @@ RFC4954
 <reply>
 <servercmd>
 REPLY EHLO 250 AUTH LOGIN
-REPLY AUTH 334 UGFzc3dvcmQ6
+REPLY AUTH 334 LOGIN supported\r
+REPLY dGVzdA== 334 UGFzc3dvcmQ6
 REPLY MTIzNA== 235 Authenticated
 </servercmd>
 </reply>
@@ -39,7 +40,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@from -u test:1
 <verify>
 <protocol>
 EHLO user\r
-AUTH LOGIN dGVzdA==\r
+AUTH LOGIN\r
+dGVzdA==\r
 MTIzNA==\r
 MAIL FROM:<904@from>\r
 RCPT TO:<904@foo>\r