Merge branch '5.6.5'

gamepdc · May 2, 2016 · 754d8c1 · 754d8c1
1 parent f0b06ff
commit 754d8c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hmailserver/test/RegressionTests/SMTP/MailFromParsing.cs b/hmailserver/test/RegressionTests/SMTP/MailFromParsing.cs
@@ -79,7 +79,7 @@ public void MailFromQuotedAddressWithSpaceAndWithParametersShouldSucceed()
       [Test]
       public void MailFromSingleQuoteShouldFail()
       {
-         AssertInvalidMailFromCommand("MAIL FROM: \"", "550 The address is not valid.");
+         AssertInvalidMailFromCommand("MAIL FROM: \"", "550 Invalid syntax. Syntax should be MAIL FROM:<mailbox@domain>[crlf]");
       }
 
       [Test]

diff --git a/hmailserver/test/RegressionTests/SMTP/RcptToParsing.cs b/hmailserver/test/RegressionTests/SMTP/RcptToParsing.cs
@@ -49,7 +49,7 @@ public void RcptToQuotedAddressWithoutSpaceShouldFail()
       [Test]
       public void RcptToSingleQuoteShouldFail()
       {
-         AssertInvalidRcptToCommand("RCPT TO: \"", "550 A valid address is required.");
+         AssertInvalidRcptToCommand("RCPT TO: \"", "550 Invalid syntax. Syntax should be RCPT TO:<mailbox@domain>[crlf]");
       }
 
       [Test]
-Original file line number
+Diff line change
@@ Expand Up @@
           [Test]
           public void MailFromSingleQuoteShouldFail()
           {
-             AssertInvalidMailFromCommand("MAIL FROM: \"", "550 The address is not valid.");
+             AssertInvalidMailFromCommand("MAIL FROM: \"", "550 Invalid syntax. Syntax should be MAIL FROM:<mailbox@domain>[crlf]");
           }
           [Test]
@@ Expand Down @@