Gitweb:
https://git.exim.org/exim.git/commitdiff/766c0c47840bcf05df030d33ae49ce90b2dab855
Commit: 766c0c47840bcf05df030d33ae49ce90b2dab855
Parent: dcbfbadac2f557dc73bbcf2b26aadf50f8414ca1
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Dec 10 23:41:50 2019 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Wed Dec 11 00:05:06 2019 +0000
Testsuite: care vs. platform differences in ordering multi-rcpt delivery
---
test/log/4052 | 50 ++++++++++++++-------
test/scripts/4050-pipe-conn/4052 | 45 ++++++++++++++++---
test/stderr/4052 | 2 +-
test/stdout/4052 | 96 +++++++++++++++++++++++++++++++---------
4 files changed, 150 insertions(+), 43 deletions(-)
diff --git a/test/log/4052 b/test/log/4052
index c5ffa63..d8b8b59 100644
--- a/test/log/4052
+++ b/test/log/4052
@@ -13,25 +13,45 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 => client_old@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbC-0005vi-00"
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for nocache2@??? withcache2@??? badbanner@???
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for nocache2@???
1999-03-02 09:44:33 10HmbD-0005vi-00 => nocache2@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 message accepted"
-1999-03-02 09:44:33 10HmbD-0005vi-00 => withcache2@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
-1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 450 sorry no banner for you today
-1999-03-02 09:44:33 10HmbD-0005vi-00 == badbanner@??? R=client T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 450 sorry no banner for you today
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for nocache@??? withcache@??? baddata@??? badrcpt@??? badmail@??? withcache2@???
-1999-03-02 09:44:33 10HmbE-0005vi-00 => nocache@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 message accepted"
-1999-03-02 09:44:33 10HmbE-0005vi-00 => withcache@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** baddata@??? R=client T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 550 obscure data error
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** badrcpt@??? R=client T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<badrcpt@???>: 550 rcpt refused
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** badmail@??? R=client T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@???>: 550 mail cmd refused
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for withcache2@???
1999-03-02 09:44:33 10HmbE-0005vi-00 => withcache2@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <CALLER@???> R=clientbounce
-1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for extchange@???
-1999-03-02 09:44:33 10HmbG-0005vi-00 => extchange@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for badbanner@???
+1999-03-02 09:44:33 10HmbF-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 450 sorry no banner for you today
+1999-03-02 09:44:33 10HmbF-0005vi-00 == badbanner@??? R=client T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 450 sorry no banner for you today
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for nocache3@???
+1999-03-02 09:44:33 10HmbG-0005vi-00 => nocache3@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 message accepted"
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for withcache3@???
+1999-03-02 09:44:33 10HmbH-0005vi-00 => withcache3@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for baddata3@???
+1999-03-02 09:44:33 10HmbI-0005vi-00 ** baddata3@??? R=client T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 550 obscure data error
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbI-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => :blackhole: <CALLER@???> R=clientbounce
+1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for badrcpt3@???
+1999-03-02 09:44:33 10HmbK-0005vi-00 ** badrcpt3@??? R=client T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<badrcpt3@???>: 550 rcpt refused
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= <> R=10HmbK-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+1999-03-02 09:44:33 10HmbL-0005vi-00 => :blackhole: <CALLER@???> R=clientbounce
+1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for badmail3@???
+1999-03-02 09:44:33 10HmbM-0005vi-00 ** badmail3@??? R=client T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@???>: 550 mail cmd refused
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> R=10HmbM-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+1999-03-02 09:44:33 10HmbN-0005vi-00 => :blackhole: <CALLER@???> R=clientbounce
+1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for withcache23@???
+1999-03-02 09:44:33 10HmbO-0005vi-00 => withcache23@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
+1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for extchange@???
+1999-03-02 09:44:33 10HmbP-0005vi-00 => extchange@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
+1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
diff --git a/test/scripts/4050-pipe-conn/4052 b/test/scripts/4050-pipe-conn/4052
index d41cf81..c85fb5b 100644
--- a/test/scripts/4050-pipe-conn/4052
+++ b/test/scripts/4050-pipe-conn/4052
@@ -48,7 +48,7 @@ sudo rm DIR/spool/db/misc
#
# Check that the cache is invalidated on SMTP errors from the server for the banner
#
-server PORT_D 3
+server PORT_D
>220 banner
<EHLO
>250-esmtp-resp
@@ -66,6 +66,11 @@ server PORT_D 3
<QUIT
>220 bye
*eof
+****
+exim -DCONTROL=127.0.0.1 -odi nocache2@???
+body 2
+****
+server PORT_D
>220 banner
<EHLO
>250-esmtp-resp
@@ -83,6 +88,11 @@ server PORT_D 3
<QUIT
>220 bye
*eof
+****
+exim -DCONTROL=127.0.0.1 -odi withcache2@???
+body 2a
+****
+server PORT_D
*sleep 2
<EHLO
<MAIL
@@ -97,13 +107,13 @@ server PORT_D 3
>>220 bye
*eof
****
-exim -DCONTROL=127.0.0.1 -odi nocache2@??? withcache2@??? badbanner@???
-body 2
+exim -DCONTROL=127.0.0.1 -odi badbanner@???
+body 2b
****
#
# Check that the cache is not invalidated on SMTP errors from the server after early-pipelining
#
-server PORT_D 6
+server PORT_D
>220 banner
<EHLO
>250-esmtp-resp
@@ -121,6 +131,11 @@ server PORT_D 6
<QUIT
>220 bye
*eof
+****
+exim -DCONTROL=127.0.0.1 -odi nocache3@???
+body
+****
+server PORT_D
>220 banner
<EHLO
>250-esmtp-resp
@@ -138,6 +153,11 @@ server PORT_D 6
<QUIT
>220 bye
*eof
+****
+exim -DCONTROL=127.0.0.1 -odi withcache3@???
+body
+****
+server PORT_D
*sleep 2
<EHLO
<MAIL
@@ -154,6 +174,11 @@ server PORT_D 6
<QUIT
>>220 bye
*eof
+****
+exim -DCONTROL=127.0.0.1 -odi baddata3@???
+body
+****
+server PORT_D
*sleep 2
<EHLO
<MAIL
@@ -170,6 +195,11 @@ server PORT_D 6
<QUIT
>>220 bye
*eof
+****
+exim -DCONTROL=127.0.0.1 -odi badrcpt3@???
+body
+****
+server PORT_D
*sleep 2
<EHLO
<MAIL
@@ -186,6 +216,11 @@ server PORT_D 6
<QUIT
>>220 bye
*eof
+****
+exim -DCONTROL=127.0.0.1 -odi badmail3@???
+body
+****
+server PORT_D
*sleep 2
>220 banner
<EHLO
@@ -205,7 +240,7 @@ server PORT_D 6
>220 bye
*eof
****
-exim -DCONTROL=127.0.0.1 -odi nocache@??? withcache@??? baddata@??? badrcpt@??? badmail@??? withcache2@???
+exim -DCONTROL=127.0.0.1 -odi withcache23@???
body
****
#
diff --git a/test/stderr/4052 b/test/stderr/4052
index 261c73b..0a8a7c9 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -18,7 +18,7 @@ checking status of 127.0.0.1
no host retry record
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
-delivering 10HmbG-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@???)
+delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@???)
Transport port=25 replaced by host-specific port=1225
EHLO response bits from cache: cleartext 0x0120 crypted 0x0000
Using cached cleartext PIPE_CONNECT
diff --git a/test/stdout/4052 b/test/stdout/4052
index 0b38af6..84e21e2 100644
--- a/test/stdout/4052
+++ b/test/stdout/4052
@@ -5,41 +5,61 @@
Listening on port 1225 ...
Connection request from [127.0.0.1]
>220 banner
-<EHLO
+<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
>250-X_PIPE_CONNECT
>250 ok
-<MAIL
+<MAIL FROM:<CALLER@???>
>250 mail-from accepted
-<RCPT
+<RCPT TO:<nocache2@???>
>250 rcpt-to accepted
<DATA
>354 data go-ahead
-R
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+ (envelope-from <CALLER@???>)
+ id 10HmbD-0005vi-00
+ for nocache2@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbD-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+body 2
+.
>250 message accepted
<QUIT
>220 bye
Expected EOF read from client
+End of script
Listening on port 1225 ...
Connection request from [127.0.0.1]
>220 banner
-<EHLO
+<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
>250-X_PIPE_CONNECT
>250 ok
-<MAIL
+<MAIL FROM:<CALLER@???>
>250 mail-from accepted
-<RCPT
+<RCPT TO:<withcache2@???>
>250 rcpt-to accepted
<DATA
>354 data go-ahead
-R
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+ (envelope-from <CALLER@???>)
+ id 10HmbE-0005vi-00
+ for withcache2@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbE-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+body 2a
+.
>250 message accepted
<QUIT
>220 bye
Expected EOF read from client
+End of script
Listening on port 1225 ...
Connection request from [127.0.0.1]
*sleep 2
@@ -59,41 +79,61 @@ End of script
Listening on port 1225 ...
Connection request from [127.0.0.1]
>220 banner
-<EHLO
+<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
>250-X_PIPE_CONNECT
>250 ok
-<MAIL
+<MAIL FROM:<CALLER@???>
>250 mail-from accepted
-<RCPT
+<RCPT TO:<nocache3@???>
>250 rcpt-to accepted
<DATA
>354 data go-ahead
-R
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+ (envelope-from <CALLER@???>)
+ id 10HmbG-0005vi-00
+ for nocache3@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbG-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+body
+.
>250 message accepted
<QUIT
>220 bye
Expected EOF read from client
+End of script
Listening on port 1225 ...
Connection request from [127.0.0.1]
>220 banner
-<EHLO
+<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
>250-X_PIPE_CONNECT
>250 ok
-<MAIL
+<MAIL FROM:<CALLER@???>
>250 mail-from accepted
-<RCPT
+<RCPT TO:<withcache3@???>
>250 rcpt-to accepted
<DATA
>354 data go-ahead
-R
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+ (envelope-from <CALLER@???>)
+ id 10HmbH-0005vi-00
+ for withcache3@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbH-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+body
+.
>250 message accepted
<QUIT
>220 bye
Expected EOF read from client
+End of script
Listening on port 1225 ...
Connection request from [127.0.0.1]
*sleep 2
@@ -112,6 +152,7 @@ Connection request from [127.0.0.1]
<QUIT
>>220 bye
Expected EOF read from client
+End of script
Listening on port 1225 ...
Connection request from [127.0.0.1]
*sleep 2
@@ -130,6 +171,7 @@ Connection request from [127.0.0.1]
<QUIT
>>220 bye
Expected EOF read from client
+End of script
Listening on port 1225 ...
Connection request from [127.0.0.1]
*sleep 2
@@ -148,22 +190,32 @@ Connection request from [127.0.0.1]
<QUIT
>>220 bye
Expected EOF read from client
+End of script
Listening on port 1225 ...
Connection request from [127.0.0.1]
*sleep 2
>220 banner
-<EHLO
+<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
>250-X_PIPE_CONNECT
>250 ok
-<MAIL
+<MAIL FROM:<CALLER@???>
>250 mail-from accepted
-<RCPT
+<RCPT TO:<withcache23@???>
>250 rcpt-to accepted
<DATA
>354 data go-ahead
-R
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+ (envelope-from <CALLER@???>)
+ id 10HmbO-0005vi-00
+ for withcache23@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbO-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+body
+.
>250 message accepted
<QUIT
>220 bye
@@ -186,9 +238,9 @@ Connection request from [127.0.0.1]
>354 data go-ahead
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@???>)
- id 10HmbG-0005vi-00
+ id 10HmbP-0005vi-00
for extchange@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@???>
+Message-Id: <E10HmbP-0005vi-00@???>
From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
