21 files changed, 66 insertions, 66 deletions
diff --git a/tests/data/test1320 b/tests/data/test1320
index 4d6c8ea85..a84784889 100644
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -35,7 +35,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt 1320@example.com --mail-from 1320@example.com -T - -p -x %HOSTIP:%PROXYPORT
+smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt recipient@example.com --mail-from sender@example.com -T - -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
@@ -47,8 +47,8 @@ smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt 1320@example.com --mail-from 1320@ex
 </strip>
 <protocol>
 EHLO 1320
-MAIL FROM:<1320@example.com>
-RCPT TO:<1320@example.com>
+MAIL FROM:<recipient@example.com>
+RCPT TO:<sender@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test1406 b/tests/data/test1406
index 819e44313..61a5ba28c 100644
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -32,7 +32,7 @@ To: another
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/1406 --mail-rcpt 1406@example.com --mail-rcpt 1406@foobar.example.com --mail-from 1406@example.com -T log/test1406.eml --libcurl log/test1406.c
+smtp://%HOSTIP:%SMTPPORT/1406 --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T log/test1406.eml --libcurl log/test1406.c
 </command>
 </client>
 
@@ -41,9 +41,9 @@ smtp://%HOSTIP:%SMTPPORT/1406 --mail-rcpt 1406@example.com --mail-rcpt 1406@foob
 <verify>
 <protocol>
 EHLO 1406
-MAIL FROM:<1406@example.com> SIZE=38
-RCPT TO:<1406@example.com>
-RCPT TO:<1406@foobar.example.com>
+MAIL FROM:<sender@example.com> SIZE=38
+RCPT TO:<recipient.one@example.com>
+RCPT TO:<recipient.two@foobar.example.com>
 DATA
 QUIT
 </protocol>
@@ -68,8 +68,8 @@ int main(int argc, char *argv[])
   struct curl_slist *slist1;
 
   slist1 = NULL;
-  slist1 = curl_slist_append(slist1, "1406@example.com");
-  slist1 = curl_slist_append(slist1, "1406@foobar.example.com");
+  slist1 = curl_slist_append(slist1, "recipient.one@example.com");
+  slist1 = curl_slist_append(slist1, "recipient.two@example.com");
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_INFILESIZE_LARGE, (curl_off_t)38);
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
   curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L);
-  curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "1406@example.com");
+  curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "sender@example.com");
   curl_easy_setopt(hnd, CURLOPT_MAIL_RCPT, slist1);
 
   /* Here is a list of options the curl code used that cannot get generated
diff --git a/tests/data/test900 b/tests/data/test900
index 36f063388..0dd7f5273 100644
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/900 --mail-rcpt 900@example.com --mail-from 900@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/900 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/900 --mail-rcpt 900@example.com --mail-from 900@example
 <verify>
 <protocol>
 EHLO 900
-MAIL FROM:<900@example.com>
-RCPT TO:<900@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test901 b/tests/data/test901
index 7836dcfb3..8148b29e4 100644
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/901 --mail-rcpt 901@example.com --mail-from 901@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/901 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/901 --mail-rcpt 901@example.com --mail-from 901@example
 <verify>
 <protocol>
 EHLO 901
-MAIL FROM:<901@example.com>
-RCPT TO:<901@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test902 b/tests/data/test902
index 2994eeff3..8ee105f7a 100644
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -31,7 +31,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/902 --mail-rcpt 902@example.com --mail-from 902@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/902 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/902 --mail-rcpt 902@example.com --mail-from 902@example
 <protocol>
 EHLO 902
 HELO 902
-MAIL FROM:<902@example.com>
-RCPT TO:<902@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test903 b/tests/data/test903
index 1b4530dc1..8c0e90fa9 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -31,7 +31,7 @@ SMTP plain authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt 903@example.com --mail-from 903@example.com -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 -T -
 </command>
 </client>
 
@@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt 903@example.com --mail-from 903@example
 EHLO 903
 AUTH PLAIN
 dGVzdAB0ZXN0ADEyMzQ=
-MAIL FROM:<903@example.com>
-RCPT TO:<903@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test904 b/tests/data/test904
index cb4014a5e..dd7f53386 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -31,7 +31,7 @@ SMTP login authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt 904@example.com --mail-from 904@example.com -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 -T -
 </command>
 </client>
 
@@ -43,8 +43,8 @@ EHLO 904
 AUTH LOGIN
 dGVzdA==
 MTIzNA==
-MAIL FROM:<904@example.com>
-RCPT TO:<904@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test905 b/tests/data/test905
index 214bc1822..8d8d9114f 100644
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -34,7 +34,7 @@ SMTP CRAM-MD5 authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/905 --mail-rcpt 905@example.com --mail-from 905@example.com -u tim:tanstaaftanstaaf -T -
+smtp://%HOSTIP:%SMTPPORT/905 --mail-rcpt recipient@example.com --mail-from sender@example.com -u tim:tanstaaftanstaaf -T -
 </command>
 </client>
 
@@ -45,8 +45,8 @@ smtp://%HOSTIP:%SMTPPORT/905 --mail-rcpt 905@example.com --mail-from 905@example
 EHLO 905
 AUTH CRAM-MD5
 dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw
-MAIL FROM:<905@example.com>
-RCPT TO:<905@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test906 b/tests/data/test906
index f60cec3f7..5072e9065 100644
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -39,7 +39,7 @@ LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/906 --mail-rcpt 906@example.com --mail-from 906@example.com -u testuser:testpass -T -
+smtp://%HOSTIP:%SMTPPORT/906 --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
 </command>
 </client>
 
@@ -51,8 +51,8 @@ EHLO 906
 AUTH NTLM
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAABoKBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyY3VybGhvc3Q=
-MAIL FROM:<906@example.com>
-RCPT TO:<906@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test907 b/tests/data/test907
index 7bdde410e..20533b902 100644
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -30,7 +30,7 @@ SMTP plain authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt 907@example.com --mail-from 907@example.com -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
 </command>
 </client>
 
@@ -40,8 +40,8 @@ smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt 907@example.com --mail-from 907@example
 <protocol>
 EHLO 907
 AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
-MAIL FROM:<907@example.com>
-RCPT TO:<907@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test908 b/tests/data/test908
index 0c1667a3b..9f46363b6 100644
--- a/tests/data/test908
+++ b/tests/data/test908
@@ -30,7 +30,7 @@ SMTP login authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt 908@example.com --mail-from 908@example.com -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
 </command>
 </client>
 
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt 908@example.com --mail-from 908@example
 EHLO 908
 AUTH LOGIN dGVzdA==
 MTIzNA==
-MAIL FROM:<908@example.com>
-RCPT TO:<908@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test909 b/tests/data/test909
index bc910a559..e3e907ac5 100644
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -26,7 +26,7 @@ To: another
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/909 --mail-rcpt 909@example.com --mail-from 909@example.com -T log/test909.eml
+smtp://%HOSTIP:%SMTPPORT/909 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test909.eml
 </command>
 </client>
 
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/909 --mail-rcpt 909@example.com --mail-from 909@example
 <verify>
 <protocol>
 EHLO 909
-MAIL FROM:<909@example.com>
-RCPT TO:<909@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test910 b/tests/data/test910
index a3bf480bd..c1b84ac06 100644
--- a/tests/data/test910
+++ b/tests/data/test910
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/910 --mail-rcpt 910@example.com --mail-from 910@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/910 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/910 --mail-rcpt 910@example.com --mail-from 910@example
 <verify>
 <protocol>
 EHLO 910
-MAIL FROM:<910@example.com>
-RCPT TO:<910@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test911 b/tests/data/test911
index 206f8afe0..cc87349b8 100644
--- a/tests/data/test911
+++ b/tests/data/test911
@@ -25,7 +25,7 @@ SMTP with no mail data
 </stdin>
 
  <command>
-smtp://%HOSTIP:%SMTPPORT/911 --mail-rcpt 911@example.com --mail-from 911@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/911 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,8 +34,8 @@ smtp://%HOSTIP:%SMTPPORT/911 --mail-rcpt 911@example.com --mail-from 911@example
 <verify>
 <protocol>
 EHLO 911
-MAIL FROM:<911@example.com>
-RCPT TO:<911@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test912 b/tests/data/test912
index 04abfd79a..575cf634a 100644
--- a/tests/data/test912
+++ b/tests/data/test912
@@ -30,7 +30,7 @@ To: another
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/912 --mail-rcpt 912@example.com --mail-from 912@example.com -T log/test912.eml
+smtp://%HOSTIP:%SMTPPORT/912 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test912.eml
 </command>
 </client>
 
@@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/912 --mail-rcpt 912@example.com --mail-from 912@example
 <verify>
 <protocol>
 EHLO 912
-MAIL FROM:<912@example.com> SIZE=38
-RCPT TO:<912@example.com>
+MAIL FROM:<sender@example.com> SIZE=38
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test913 b/tests/data/test913
index 8c016e930..c7d547c30 100644
--- a/tests/data/test913
+++ b/tests/data/test913
@@ -30,7 +30,7 @@ To: another
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/913 --mail-rcpt 913@example.com --mail-from 913@example.com -T log/test913.eml
+smtp://%HOSTIP:%SMTPPORT/913 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test913.eml
 </command>
 </client>
 
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/913 --mail-rcpt 913@example.com --mail-from 913@example
 </errorcode>
 <protocol>
 EHLO 913
-MAIL FROM:<913@example.com> SIZE=38
+MAIL FROM:<sender@example.com> SIZE=38
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test914 b/tests/data/test914
index cc97bdd9f..16ea47028 100644
--- a/tests/data/test914
+++ b/tests/data/test914
@@ -26,7 +26,7 @@ To: another
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/914 --mail-rcpt 914@example.com --mail-from invalid -T log/test914.eml
+smtp://%HOSTIP:%SMTPPORT/914 --mail-rcpt recipient@example.com --mail-from invalid -T log/test914.eml
 </command>
 </client>
 
diff --git a/tests/data/test915 b/tests/data/test915
index 3b5b62e16..4d31db3c1 100644
--- a/tests/data/test915
+++ b/tests/data/test915
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/915 --mail-rcpt 915@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/915 --mail-rcpt recipient@example.com -T -
 </command>
 </client>
 
@@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/915 --mail-rcpt 915@example.com -T -
 <protocol>
 EHLO 915
 MAIL FROM:<>
-RCPT TO:<915@example.com>
+RCPT TO:<recipient@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test916 b/tests/data/test916
index f2e0aedd0..807bb267f 100644
--- a/tests/data/test916
+++ b/tests/data/test916
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/916 --mail-rcpt invalid --mail-from 916@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/916 --mail-rcpt invalid --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/916 --mail-rcpt invalid --mail-from 916@example.com -T
 </errorcode>
 <protocol>
 EHLO 916
-MAIL FROM:<916@example.com>
+MAIL FROM:<sender@example.com>
 RCPT TO:<invalid>
 QUIT
 </protocol>
diff --git a/tests/data/test917 b/tests/data/test917
index 23a05ecb1..cc75da3aa 100644
--- a/tests/data/test917
+++ b/tests/data/test917
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/917 --mail-rcpt 917@example.com --mail-rcpt 917@foo.example.com --mail-rcpt 917@bar.example.com --mail-rcpt 917@foobar.example.com --mail-rcpt 917@another.example.com --mail-from 917@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/917 --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -35,12 +35,12 @@ smtp://%HOSTIP:%SMTPPORT/917 --mail-rcpt 917@example.com --mail-rcpt 917@foo.exa
 <verify>
 <protocol>
 EHLO 917
-MAIL FROM:<917@example.com>
-RCPT TO:<917@example.com>
-RCPT TO:<917@foo.example.com>
-RCPT TO:<917@bar.example.com>
-RCPT TO:<917@foobar.example.com>
-RCPT TO:<917@another.example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient.one@example.com>
+RCPT TO:<recipient.two@example.com>
+RCPT TO:<recipient.three@example.com>
+RCPT TO:<recipient.four@example.com>
+RCPT TO:<recipient.five@example.com>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test918 b/tests/data/test918
index 4817e2814..6f3a382b4 100644
--- a/tests/data/test918
+++ b/tests/data/test918
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/918 --mail-rcpt 918@example.com --mail-rcpt invalid --mail-rcpt 918@bar.example.com --mail-rcpt sTrAnGe --mail-rcpt 918@another.example.com --mail-from 918@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/918 --mail-rcpt recipient.one@example.com --mail-rcpt invalid --mail-rcpt recipient.three@example.com --mail-rcpt sTrAnGe --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,8 +38,8 @@ smtp://%HOSTIP:%SMTPPORT/918 --mail-rcpt 918@example.com --mail-rcpt invalid --m
 </errorcode>
 <protocol>
 EHLO 918
-MAIL FROM:<918@example.com>
-RCPT TO:<918@example.com>
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient.one@example.com>
 RCPT TO:<invalid>
 QUIT
 </protocol>