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
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
****
****
# 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
.
#
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
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
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
sleep 2
exim -d-all+transport -qf
****
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
exim -odi userx
****
sleep 2
# 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
# 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
#
#
# 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
#
#
****
#
# 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
****
sleep 1
killdaemon
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
#
#
#
sleep 1
killdaemon
millisleep 200
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
#
#
#
****
sleep 1
killdaemon
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
#
#
#
sleep 1
killdaemon
millisleep 200
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
#
#
#
#
#
# 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
****
#
#
# 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
****
****
sleep 1
killdaemon
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
#
#
#
****
sleep 1
killdaemon
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry*
#
#
#
sleep 1
killdaemon
no_msglog_check
-sudo rm -f DIR/spool/db/retry
+sudo rm -f DIR/spool/db/retry*
#
#
#
****
sleep 1
killdaemon
-sudo rm -f DIR/spool/db/retry
+sudo rm -f DIR/spool/db/retry*
#
#
#
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)
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)
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)
****
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)
****
# 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