summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/runtest2
-rw-r--r--test/scripts/0000-Basic/00373
-rw-r--r--test/scripts/0000-Basic/01352
-rw-r--r--test/scripts/0000-Basic/02112
-rw-r--r--test/scripts/0000-Basic/02644
-rw-r--r--test/scripts/0000-Basic/05122
-rw-r--r--test/scripts/1190-TLS-ALPN/11904
-rw-r--r--test/scripts/2090-GnuTLS-ALPN/20902
-rw-r--r--test/scripts/2190-OpenSSL-ALPN/21902
-rw-r--r--test/scripts/4056-pipe-conn-auth/40562
-rw-r--r--test/scripts/5600-OCSP-OpenSSL/56014
-rw-r--r--test/scripts/5600-OCSP-OpenSSL/56114
-rw-r--r--test/scripts/5650-OCSP-GnuTLS/56514
-rw-r--r--test/scripts/5730-OCSP-GnuTLS-events/57304
-rw-r--r--test/scripts/5740-OCSP-OpenSSL-events/57404
-rw-r--r--test/scripts/5820-DANE-GnuTLS/58202
-rw-r--r--test/scripts/5840-DANE-OpenSSL/58402
-rw-r--r--test/scripts/5892-Resume-OpenSSL/58922
-rw-r--r--test/scripts/5893-Resume-OpenSSL-OCSP/58932
-rw-r--r--test/scripts/9900-testing/99012
20 files changed, 28 insertions, 27 deletions
diff --git a/test/runtest b/test/runtest
index 209cd9c1e..6f1bd0add 100755
--- a/test/runtest
+++ b/test/runtest
@@ -2038,7 +2038,7 @@ if (! $message_skip)
foreach $mail (@mails)
{
- next if $mail eq "test-mail/oncelog";
+ next if $mail =~ /^test-mail\/oncelog(.(dir|pag|db))?$/;
$saved_mail = substr($mail, 10); # Remove "test-mail/"
$saved_mail =~ s/^$parm_caller(\/|$)/CALLER/; # Convert caller name
diff --git a/test/scripts/0000-Basic/0037 b/test/scripts/0000-Basic/0037
index ccf8f84b8..f602cad78 100644
--- a/test/scripts/0000-Basic/0037
+++ b/test/scripts/0000-Basic/0037
@@ -132,7 +132,8 @@ vacation message
exim -odi filter-vdefaults
Subject: should give rise to 2nd vacation message
****
-sudo rm DIR/test-mail/.vacation DIR/test-mail/.vacation.msg
+sudo rm -f DIR/test-mail/.vacation DIR/test-mail/.vacation.dir DIR/test-mail/.vacation.pag DIR/test-mail/.vacation.db
+sudo rm DIR/test-mail/.vacation.msg
#
exim -bF DIR/aux-fixed/TESTNUM.f-5 </dev/null
****
diff --git a/test/scripts/0000-Basic/0135 b/test/scripts/0000-Basic/0135
index f8f661a43..2c90357ce 100644
--- a/test/scripts/0000-Basic/0135
+++ b/test/scripts/0000-Basic/0135
@@ -15,7 +15,7 @@ exim -odi -q
****
# Remove so that next message does not arrive before
# the time of first failure.
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
exim -odq -f '<>' b@known.ex
test 2
.
diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211
index c27a7ebf3..1621619c8 100644
--- a/test/scripts/0000-Basic/0211
+++ b/test/scripts/0000-Basic/0211
@@ -66,7 +66,7 @@ Test message 2
#
exim -z "Test: reject ehlo, then close (late, giving time for HELO)"
****
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
server PORT_S
220 Connected OK
EHLO
diff --git a/test/scripts/0000-Basic/0264 b/test/scripts/0000-Basic/0264
index 2b97ad4f6..e4d517164 100644
--- a/test/scripts/0000-Basic/0264
+++ b/test/scripts/0000-Basic/0264
@@ -28,7 +28,7 @@ exim -q
exim -Mrm $msg1 $msg2
****
# Using a router with preconditions (local_parts, here) should get an address-retry record
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
exim -odi r4.a@outside
****
dump retry
@@ -41,7 +41,7 @@ exim -odi r5.a@r5domain.ex
exim -Mrm $msg1 $msg2 $msg3
****
# Using a router with no non-domain preconditions, first should write a domain-retry record.
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
exim -odi rz.a@outside
****
dump retry
diff --git a/test/scripts/0000-Basic/0512 b/test/scripts/0000-Basic/0512
index c33e0adba..99581a3c6 100644
--- a/test/scripts/0000-Basic/0512
+++ b/test/scripts/0000-Basic/0512
@@ -6,7 +6,7 @@ exim -odi userx
sleep 2
exim -d-all+transport -qf
****
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
exim -odi userx
****
sleep 2
diff --git a/test/scripts/1190-TLS-ALPN/1190 b/test/scripts/1190-TLS-ALPN/1190
index 3a85116fd..50fbb7aeb 100644
--- a/test/scripts/1190-TLS-ALPN/1190
+++ b/test/scripts/1190-TLS-ALPN/1190
@@ -11,12 +11,12 @@ Test message.
# Bad ALPN rejected
exim -DCONTROL=http -odf b@test.ex
****
-sudo rm -f DIR/spool/db/retry DIR/spool/input/*-D DIR/spool/input/*-H
+sudo rm -f DIR/spool/db/retry* DIR/spool/input/*-D DIR/spool/input/*-H
#
# Multiple ALPN rejected
exim -DCONTROL=smtp:smtp -odf c@test.ex
****
-sudo rm -f DIR/spool/db/retry DIR/spool/input/*-D DIR/spool/input/*-H
+sudo rm -f DIR/spool/db/retry* DIR/spool/input/*-D DIR/spool/input/*-H
#
# Empty client option is ok
exim -DCONTROL="" -odf d@test.ex
diff --git a/test/scripts/2090-GnuTLS-ALPN/2090 b/test/scripts/2090-GnuTLS-ALPN/2090
index 621d8a967..bb9262a23 100644
--- a/test/scripts/2090-GnuTLS-ALPN/2090
+++ b/test/scripts/2090-GnuTLS-ALPN/2090
@@ -15,7 +15,7 @@ exim -DSERVER=server -DSTRICT="" -bd -oX PORT_D
# Client requires ALPN (fail)
exim -DCONTROL=http -DREQUIRE=y -odf client_require_fail@test.ex
****
-sudo rm -f DIR/spool/db/retry DIR/spool/input/*-D DIR/spool/input/*-H
+sudo rm -f DIR/spool/db/retry* DIR/spool/input/*-D DIR/spool/input/*-H
killdaemon
#
#
diff --git a/test/scripts/2190-OpenSSL-ALPN/2190 b/test/scripts/2190-OpenSSL-ALPN/2190
index d615e1b23..e6ea3aabf 100644
--- a/test/scripts/2190-OpenSSL-ALPN/2190
+++ b/test/scripts/2190-OpenSSL-ALPN/2190
@@ -14,7 +14,7 @@ exim -DSERVER=server -DSTRICT="" -bd -oX PORT_D
# Client requires ALPN (fail)
exim -DCONTROL=http -DREQUIRE=y -odf client_require_fail@test.ex
****
-sudo rm -f DIR/spool/db/retry DIR/spool/input/*-D DIR/spool/input/*-H
+sudo rm -f DIR/spool/db/retry* DIR/spool/input/*-D DIR/spool/input/*-H
killdaemon
#
#
diff --git a/test/scripts/4056-pipe-conn-auth/4056 b/test/scripts/4056-pipe-conn-auth/4056
index 9b2ab8223..abb46dc7f 100644
--- a/test/scripts/4056-pipe-conn-auth/4056
+++ b/test/scripts/4056-pipe-conn-auth/4056
@@ -47,7 +47,7 @@ exim -Mrm $msg1
****
#
# Tidy the retry db, for test purposes
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
#
#
# Then, advertising again, initial attempt should not get early-pipe
diff --git a/test/scripts/5600-OCSP-OpenSSL/5601 b/test/scripts/5600-OCSP-OpenSSL/5601
index 7a870425f..a0e8540a2 100644
--- a/test/scripts/5600-OCSP-OpenSSL/5601
+++ b/test/scripts/5600-OCSP-OpenSSL/5601
@@ -42,7 +42,7 @@ test message.
****
sleep 1
killdaemon
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
#
#
#
@@ -56,7 +56,7 @@ test message.
sleep 1
killdaemon
millisleep 200
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
#
#
#
diff --git a/test/scripts/5600-OCSP-OpenSSL/5611 b/test/scripts/5600-OCSP-OpenSSL/5611
index 695406491..1bcb59cdf 100644
--- a/test/scripts/5600-OCSP-OpenSSL/5611
+++ b/test/scripts/5600-OCSP-OpenSSL/5611
@@ -42,7 +42,7 @@ test message.
****
sleep 1
killdaemon
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
#
#
#
@@ -56,7 +56,7 @@ test message.
sleep 1
killdaemon
millisleep 200
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
#
#
#
diff --git a/test/scripts/5650-OCSP-GnuTLS/5651 b/test/scripts/5650-OCSP-GnuTLS/5651
index dbf802298..567fec2b6 100644
--- a/test/scripts/5650-OCSP-GnuTLS/5651
+++ b/test/scripts/5650-OCSP-GnuTLS/5651
@@ -47,7 +47,7 @@ no_msglog_check
#
#
# Client fails on revoked stapled info
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \
-DOPT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
****
@@ -61,7 +61,7 @@ killdaemon
#
#
# Client fails on expired stapled info
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \
-DOPT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
****
diff --git a/test/scripts/5730-OCSP-GnuTLS-events/5730 b/test/scripts/5730-OCSP-GnuTLS-events/5730
index 11c3a867f..18629a15f 100644
--- a/test/scripts/5730-OCSP-GnuTLS-events/5730
+++ b/test/scripts/5730-OCSP-GnuTLS-events/5730
@@ -52,7 +52,7 @@ test message.
****
sleep 1
killdaemon
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
#
#
#
@@ -65,7 +65,7 @@ test message.
****
sleep 1
killdaemon
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
#
#
#
diff --git a/test/scripts/5740-OCSP-OpenSSL-events/5740 b/test/scripts/5740-OCSP-OpenSSL-events/5740
index fd137b012..a7b3c334e 100644
--- a/test/scripts/5740-OCSP-OpenSSL-events/5740
+++ b/test/scripts/5740-OCSP-OpenSSL-events/5740
@@ -53,7 +53,7 @@ test message.
sleep 1
killdaemon
no_msglog_check
-sudo rm -f DIR/spool/db/retry
+sudo rm -f DIR/spool/db/retry*
#
#
#
@@ -66,7 +66,7 @@ test message.
****
sleep 1
killdaemon
-sudo rm -f DIR/spool/db/retry
+sudo rm -f DIR/spool/db/retry*
#
#
#
diff --git a/test/scripts/5820-DANE-GnuTLS/5820 b/test/scripts/5820-DANE-GnuTLS/5820
index f663e1aaf..c50fe2cbc 100644
--- a/test/scripts/5820-DANE-GnuTLS/5820
+++ b/test/scripts/5820-DANE-GnuTLS/5820
@@ -130,7 +130,7 @@ Testing
killdaemon
#
#
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
****
### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)
diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840
index f968930df..c827cc190 100644
--- a/test/scripts/5840-DANE-OpenSSL/5840
+++ b/test/scripts/5840-DANE-OpenSSL/5840
@@ -132,7 +132,7 @@ Testing
killdaemon
#
#
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
****
### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)
diff --git a/test/scripts/5892-Resume-OpenSSL/5892 b/test/scripts/5892-Resume-OpenSSL/5892
index 5a8dd3ef2..1fdc7e949 100644
--- a/test/scripts/5892-Resume-OpenSSL/5892
+++ b/test/scripts/5892-Resume-OpenSSL/5892
@@ -24,7 +24,7 @@ Test message.
exim -odf notreq@test.ex
Test message, not requesting resumption.
****
-sudo rm -f DIR/spool/db/tls
+sudo rm -f DIR/spool/db/tls*
exim -odf -DVALUE=resume noverify_getticket@test.ex
Dest on this means the server cert will not verify (but try_verify will permit it)
****
diff --git a/test/scripts/5893-Resume-OpenSSL-OCSP/5893 b/test/scripts/5893-Resume-OpenSSL-OCSP/5893
index a85c3edda..2c525d838 100644
--- a/test/scripts/5893-Resume-OpenSSL-OCSP/5893
+++ b/test/scripts/5893-Resume-OpenSSL-OCSP/5893
@@ -24,7 +24,7 @@ Test message.
exim -odf notreq@test.ex
Test message, not requesting resumption.
****
-sudo rm -f DIR/spool/db/tls
+sudo rm -f DIR/spool/db/tls*
exim -odf -DVALUE=resume noverify_getticket@test.ex
Dest on this means the server cert will not verify (but try_verify will permit it)
****
diff --git a/test/scripts/9900-testing/9901 b/test/scripts/9900-testing/9901
index b9943ce2c..1a736e5a5 100644
--- a/test/scripts/9900-testing/9901
+++ b/test/scripts/9900-testing/9901
@@ -18,7 +18,7 @@ sudo exim -Mar $msg2 delay@2.test.again.dns
# Remove the retry data so that we do attempt the routing during
# delivery. That slows it down enough for the server to time out.
#
-# sudo rm spool/db/retry
+# sudo rm spool/db/retry*
exim -q -d-all+route+dns
****
killdaemon
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 17:57:04 +0000