Commit dfe7ee14 authored by Steve Holme's avatar Steve Holme
Browse files

tests: Fixed smtp mail from addresses

parent 841103c7

tests/data/test1320

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ To: another 
body

</stdin>

 <command>

smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.example --mail-from 1320@from -T - -p -x %HOSTIP:%PROXYPORT

smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.example --mail-from 1320@example.com -T - -p -x %HOSTIP:%PROXYPORT

</command>

</client>
@@ -47,7 +47,7 @@ smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.exa 
</strip>

<protocol>

EHLO user

MAIL FROM:<1320@from>

MAIL FROM:<1320@example.com>

RCPT TO:<1320@foo>

RCPT TO:<1320@foobar.example>

DATA

tests/data/test1406

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ To: another 
body

</file>

 <command>

smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.example --mail-from 1406@from -T log/test1406.eml --libcurl log/test1406.c

smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.example --mail-from 1406@example.com -T log/test1406.eml --libcurl log/test1406.c

</command>

</client>
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.examp 
<verify>

<protocol>

EHLO user

MAIL FROM:<1406@from> SIZE=38

MAIL FROM:<1406@example.com> SIZE=38

RCPT TO:<1406@foo>

RCPT TO:<1406@foobar.example>

DATA
@@ -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@from");

  curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "1406@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

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ To: another 
body

</stdin>

 <command>

smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@from -T -

smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@example.com -T -

</command>

</client>
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example 
<verify>

<protocol>

EHLO user

MAIL FROM:<900@from>

MAIL FROM:<900@example.com>

RCPT TO:<900@foo>

RCPT TO:<900@foobar.example>

DATA

tests/data/test901

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ To: another 
body

</stdin>

 <command>

smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T -

smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from 901@example.com -T -

</command>

</client>
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T - 
<verify>

<protocol>

EHLO user

MAIL FROM:<901@from>

MAIL FROM:<901@example.com>

RCPT TO:<901@foo>

DATA

QUIT

tests/data/test902

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ To: another 
body

</stdin>

 <command>

smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T -

smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@example.com -T -

</command>

</client>
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T - 
<protocol>

EHLO user

HELO user

MAIL FROM:<902@from>

MAIL FROM:<902@example.com>

RCPT TO:<902@foo>

DATA

QUIT