summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/confs/20381
-rw-r--r--test/confs/21381
-rw-r--r--test/log/20381
-rw-r--r--test/log/21381
-rw-r--r--test/scripts/2000-GnuTLS/20381
-rw-r--r--test/scripts/2100-OpenSSL/21381
6 files changed, 2 insertions, 4 deletions
diff --git a/test/confs/2038 b/test/confs/2038
index 140819433..d5465e30d 100644
--- 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
+remote_max_parallel = 1
smtp_accept_max_nonmail = 0
diff --git a/test/confs/2138 b/test/confs/2138
index d6d7604d8..7fec82541 100644
--- 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
+remote_max_parallel = 1
smtp_accept_max_nonmail = 0
diff --git a/test/log/2038 b/test/log/2038
index b3dfed849..1ffc1aa92 100644
--- 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
diff --git a/test/log/2138 b/test/log/2138
index 6bc8e0284..6e82af290 100644
--- 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
diff --git a/test/scripts/2000-GnuTLS/2038 b/test/scripts/2000-GnuTLS/2038
index 83259d998..650286814 100644
--- a/test/scripts/2000-GnuTLS/2038
+++ b/test/scripts/2000-GnuTLS/2038
@@ -16,4 +16,3 @@ exim -qqf
killdaemon
exim -DSERVER=server -DNOTDAEMON -qf
****
-sortlog
diff --git a/test/scripts/2100-OpenSSL/2138 b/test/scripts/2100-OpenSSL/2138
index 3a94a1f2e..79eaa2f31 100644
--- a/test/scripts/2100-OpenSSL/2138
+++ b/test/scripts/2100-OpenSSL/2138
@@ -15,4 +15,3 @@ exim -qqf
killdaemon
exim -DSERVER=server -DNOTDAEMON -qf
****
-sortlog