Commit 25a0c96a authored by Steve Holme's avatar Steve Holme
Browse files

tests: Updated email addresses in SMTP tests following recent changes

parent a8b606b1

tests/data/test1320

+3 −3
Original line number Diff line number Diff line
@@ -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>

tests/data/test1406

+7 −7
Original line number Diff line number Diff line
@@ -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

tests/data/test900

+3 −3
Original line number Diff line number Diff line
@@ -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>

tests/data/test901

+3 −3
Original line number Diff line number Diff line
@@ -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>

tests/data/test902

+3 −3
Original line number Diff line number Diff line
@@ -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>