git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f5978b0
)
Testsuite: avoid indeterminate delivery ordering
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 14 Oct 2017 20:53:10 +0000
(21:53 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 14 Oct 2017 20:53:10 +0000
(21:53 +0100)
test/confs/2038
patch
|
blob
|
history
test/confs/2138
patch
|
blob
|
history
test/log/2038
patch
|
blob
|
history
test/log/2138
patch
|
blob
|
history
test/scripts/2000-GnuTLS/2038
patch
|
blob
|
history
test/scripts/2100-OpenSSL/2138
patch
|
blob
|
history
diff --git
a/test/confs/2038
b/test/confs/2038
index 1408194334140c07fe2abb487c00df12f5f7a5bc..d5465e30dfeb821c7c6aec13d28b7d61943523ed 100644
(file)
--- a/
test/confs/2038
+++ b/
test/confs/2038
@@
-14,6
+14,7
@@
log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients
queue_only
queue_run_in_order
queue_only
queue_run_in_order
+remote_max_parallel = 1
smtp_accept_max_nonmail = 0
smtp_accept_max_nonmail = 0
diff --git
a/test/confs/2138
b/test/confs/2138
index d6d7604d8f1871e7517e84c01ac567f4e3882448..7fec82541853f7a4f27d0422ce8f639603360a59 100644
(file)
--- a/
test/confs/2138
+++ b/
test/confs/2138
@@
-14,6
+14,7
@@
log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients
queue_only
queue_run_in_order
queue_only
queue_run_in_order
+remote_max_parallel = 1
smtp_accept_max_nonmail = 0
smtp_accept_max_nonmail = 0
diff --git
a/test/log/2038
b/test/log/2038
index b3dfed8493cdb139082dead99146b988fa9d0d30..1ffc1aa9208d6832d34e9c7f343d24a9b4da97ed 100644
(file)
--- a/
test/log/2038
+++ b/
test/log/2038
@@
-1,4
+1,3
@@
-**NOTE: The delivery lines in this file have been sorted.
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx0@test.ex userx1@test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery0@test.ex usery1@test.ex
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz0@test.ex userz1@test.ex
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx0@test.ex userx1@test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery0@test.ex usery1@test.ex
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz0@test.ex userz1@test.ex
diff --git
a/test/log/2138
b/test/log/2138
index 6bc8e028406ed4d7d1fc6dfbe624deddba066150..6e82af29098e8c9b9fd9ab6e3a7cc0922c560819 100644
(file)
--- a/
test/log/2138
+++ b/
test/log/2138
@@
-1,4
+1,3
@@
-**NOTE: The delivery lines in this file have been sorted.
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx0@test.ex userx1@test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery0@test.ex usery1@test.ex
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz0@test.ex userz1@test.ex
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx0@test.ex userx1@test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery0@test.ex usery1@test.ex
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz0@test.ex userz1@test.ex
diff --git
a/test/scripts/2000-GnuTLS/2038
b/test/scripts/2000-GnuTLS/2038
index 83259d9988f5d442286c59489cfa9b873cf824b9..6502868141166a2ba9b74706fe386384c309d026 100644
(file)
--- a/
test/scripts/2000-GnuTLS/2038
+++ b/
test/scripts/2000-GnuTLS/2038
@@
-16,4
+16,3
@@
exim -qqf
killdaemon
exim -DSERVER=server -DNOTDAEMON -qf
****
killdaemon
exim -DSERVER=server -DNOTDAEMON -qf
****
-sortlog
diff --git
a/test/scripts/2100-OpenSSL/2138
b/test/scripts/2100-OpenSSL/2138
index 3a94a1f2e70eb0ca32d0524a7dab479a6e163e7e..79eaa2f31e5ade53b21e803b99e6b1dfa109abe0 100644
(file)
--- a/
test/scripts/2100-OpenSSL/2138
+++ b/
test/scripts/2100-OpenSSL/2138
@@
-15,4
+15,3
@@
exim -qqf
killdaemon
exim -DSERVER=server -DNOTDAEMON -qf
****
killdaemon
exim -DSERVER=server -DNOTDAEMON -qf
****
-sortlog