tests: Reworked existing SMTP tests to be single recipient based

...in preparation of upcoming multiple recipient tests.

diff --git a/tests/data/test900 b/tests/data/test900
index 25b3f46368cde0f547c83ae50e817324a37d909e..5fcf598c2ceb75bc38c9b0009a00d50137ba1f38 100644 (file)
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-from 900@example.com -T -
 </command>
 </client>
 
@@ -37,7 +37,6 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example
 EHLO user\r
 MAIL FROM:<900@example.com>\r
 RCPT TO:<900@foo>\r
-RCPT TO:<900@foobar.example>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test909 b/tests/data/test909
index 0122dfe48e58797d393bd8ffbeff362a9368270d..a8fa3392d423d1610bf7ca3bac56d87ac3ed2a1c 100644 (file)
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -30,7 +30,7 @@ To: another
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-rcpt 909@foobar.example --mail-from 909@example.com -T log/test909.eml
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-from 909@example.com -T log/test909.eml
 </command>
 </client>
 
@@ -41,7 +41,6 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-rcpt 909@foobar.example
 EHLO user\r
 MAIL FROM:<909@example.com>\r
 RCPT TO:<909@foo>\r
-RCPT TO:<909@foobar.example>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test910 b/tests/data/test910
index 5f8186f663a367a72f93016cacfd5c333e2f8e45..05e99c52a1c10dfd749f51b725ff35b55350e4eb 100644 (file)
--- a/tests/data/test910
+++ b/tests/data/test910
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example --mail-from 910@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-from 910@example.com -T -
 </command>
 </client>
 
@@ -37,7 +37,6 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example
 EHLO user\r
 MAIL FROM:<910@example.com>\r
 RCPT TO:<910@foo>\r
-RCPT TO:<910@foobar.example>\r
 DATA\r
 QUIT\r
 </protocol>

diff --git a/tests/data/test911 b/tests/data/test911
index c8cecdc9cbecb648ab3a9715e5171bc4256acf77..4e0f1b9723141c6dae37c58862b2fa87612682ce 100644 (file)
--- a/tests/data/test911
+++ b/tests/data/test911
@@ -25,7 +25,7 @@ SMTP with no mail data
 </stdin>
 
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example --mail-from 911@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-from 911@example.com -T -
 </command>
 </client>
 
@@ -36,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example
 EHLO user\r
 MAIL FROM:<911@example.com>\r
 RCPT TO:<911@foo>\r
-RCPT TO:<911@foobar.example>\r
 DATA\r
 QUIT\r
 </protocol>