aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-04-27 12:32:27 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-04-27 12:32:27 +0100
commit4118c30261cf7f38245cbf5aa87952da7f1e0224 (patch)
tree2b8867b3d01f6058eac1476919cd8dd7210d1f3b
parentdacbdaab9422afc0dcc2d56579f8624cbd5e225e (diff)
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.
-rw-r--r--tests/data/test9036
-rw-r--r--tests/data/test9046
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/data/test903 b/tests/data/test903
index f9f2d0949..35bac4567 100644
--- 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
</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
-AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
+AUTH PLAIN
+dGVzdAB0ZXN0ADEyMzQ=
MAIL FROM:<903@from>
RCPT TO:<903@foo>
DATA
diff --git a/tests/data/test904 b/tests/data/test904
index eaccae866..9c32a25e0 100644
--- 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
+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
-AUTH LOGIN dGVzdA==
+AUTH LOGIN
+dGVzdA==
MTIzNA==
MAIL FROM:<904@from>
RCPT TO:<904@foo>