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 (parent:
fc057b9
)
Testsuite: fix for ndbm
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 27 Feb 2022 14:27:04 +0000
(14:27 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 28 Feb 2022 12:01:33 +0000
(12:01 +0000)
20 files changed:
test/runtest
patch
|
blob
|
history
test/scripts/0000-Basic/0037
patch
|
blob
|
history
test/scripts/0000-Basic/0135
patch
|
blob
|
history
test/scripts/0000-Basic/0211
patch
|
blob
|
history
test/scripts/0000-Basic/0264
patch
|
blob
|
history
test/scripts/0000-Basic/0512
patch
|
blob
|
history
test/scripts/1190-TLS-ALPN/1190
patch
|
blob
|
history
test/scripts/2090-GnuTLS-ALPN/2090
patch
|
blob
|
history
test/scripts/2190-OpenSSL-ALPN/2190
patch
|
blob
|
history
test/scripts/4056-pipe-conn-auth/4056
patch
|
blob
|
history
test/scripts/5600-OCSP-OpenSSL/5601
patch
|
blob
|
history
test/scripts/5600-OCSP-OpenSSL/5611
patch
|
blob
|
history
test/scripts/5650-OCSP-GnuTLS/5651
patch
|
blob
|
history
test/scripts/5730-OCSP-GnuTLS-events/5730
patch
|
blob
|
history
test/scripts/5740-OCSP-OpenSSL-events/5740
patch
|
blob
|
history
test/scripts/5820-DANE-GnuTLS/5820
patch
|
blob
|
history
test/scripts/5840-DANE-OpenSSL/5840
patch
|
blob
|
history
test/scripts/5892-Resume-OpenSSL/5892
patch
|
blob
|
history
test/scripts/5893-Resume-OpenSSL-OCSP/5893
patch
|
blob
|
history
test/scripts/9900-testing/9901
patch
|
blob
|
history
diff --git
a/test/runtest
b/test/runtest
index 209cd9c1e8f3261a13a0851f4aa7c1b324b3d6b5..6f1bd0adda28fa536ee93b9f27e700a11c54e26e 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-2038,7
+2038,7
@@
if (! $message_skip)
foreach $mail (@mails)
{
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
$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 ccf8f84b844655e5949bdedefdfbb1c9e0e606cc..f602cad789e02a659e55cbd1f32bcd89f6c31784 100644
(file)
--- 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
****
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
****
#
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 f8f661a436eab0486aefe13f5df22195bd9cda65..2c90357ceffae4ac90d1ac05d5f61e49850a46cf 100644
(file)
--- 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.
****
# 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 -odq -f '<>' b@known.ex
test 2
.
diff --git
a/test/scripts/0000-Basic/0211
b/test/scripts/0000-Basic/0211
index c27a7ebf3554342ce0c9ae19c362d95e5c6ddb66..1621619c84de6dd6870a1ac2ed268c45eced437f 100644
(file)
--- 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)"
****
#
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
server PORT_S
220 Connected OK
EHLO
diff --git
a/test/scripts/0000-Basic/0264
b/test/scripts/0000-Basic/0264
index 2b97ad4f69647bb11fbd0f1c6a93394a48c738b4..e4d517164f0aca1729640cb86626e0e3924bf91d 100644
(file)
--- 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
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 -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.
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
exim -odi rz.a@outside
****
dump retry
diff --git
a/test/scripts/0000-Basic/0512
b/test/scripts/0000-Basic/0512
index c33e0adba8ca29f360a3657950fc2f7f43d4aeb5..99581a3c6d375a5965c431d7f190225991ea1ca7 100644
(file)
--- 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
****
sleep 2
exim -d-all+transport -qf
****
-sudo rm spool/db/retry
+sudo rm spool/db/retry
*
exim -odi userx
****
sleep 2
exim -odi userx
****
sleep 2
diff --git
a/test/scripts/1190-TLS-ALPN/1190
b/test/scripts/1190-TLS-ALPN/1190
index 3a85116fdb3445875931f81fef665ffbdb0dcee7..50fbb7aeb661c8512289d6f224f432778b5a15b9 100644
(file)
--- 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
****
# 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
****
#
# 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
#
# 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 621d8a967979481c630c4fe2dc64fe2f91c950aa..bb9262a2309e75ec17929cc47656ddcbb80770f0 100644
(file)
--- 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
****
# 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
#
#
killdaemon
#
#
diff --git
a/test/scripts/2190-OpenSSL-ALPN/2190
b/test/scripts/2190-OpenSSL-ALPN/2190
index d615e1b23ff11b3e2323089284dc22bb7a3b93e0..e6ea3aabfb2744ad797ccd523ce8be741874858f 100644
(file)
--- 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
****
# 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
#
#
killdaemon
#
#
diff --git
a/test/scripts/4056-pipe-conn-auth/4056
b/test/scripts/4056-pipe-conn-auth/4056
index 9b2ab8223f6aee179c25c2b03c525935a7ca5649..abb46dc7fee7bf41ff85199c8ff29c60d92d3ed0 100644
(file)
--- 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
****
#
# 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
#
#
# 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 7a870425f8f36a7068565a9c13441ee6f204152b..a0e8540a237341e1bcd2831b1f34b93331b1ab0b 100644
(file)
--- a/
test/scripts/5600-OCSP-OpenSSL/5601
+++ b/
test/scripts/5600-OCSP-OpenSSL/5601
@@
-42,7
+42,7
@@
test message.
****
sleep 1
killdaemon
****
sleep 1
killdaemon
-sudo rm spool/db/retry
+sudo rm spool/db/retry
*
#
#
#
#
#
#
@@
-56,7
+56,7
@@
test message.
sleep 1
killdaemon
millisleep 200
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 695406491412935b3e86da50ec523c36219007b4..1bcb59cdf723450205128fae0f6deb047b1b7be0 100644
(file)
--- a/
test/scripts/5600-OCSP-OpenSSL/5611
+++ b/
test/scripts/5600-OCSP-OpenSSL/5611
@@
-42,7
+42,7
@@
test message.
****
sleep 1
killdaemon
****
sleep 1
killdaemon
-sudo rm spool/db/retry
+sudo rm spool/db/retry
*
#
#
#
#
#
#
@@
-56,7
+56,7
@@
test message.
sleep 1
killdaemon
millisleep 200
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 dbf80229837b42956ddd956867ea865ebfe3ee7a..567fec2b605c9f95e2f7c4d3f17876b8845110b7 100644
(file)
--- 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
#
#
# 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
****
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
#
#
# 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
****
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 11c3a867f80bed6bd82705ef599f961100b98e1a..18629a15f1eda90906d23e37a9836ec642f3468e 100644
(file)
--- 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
****
sleep 1
killdaemon
-sudo rm DIR/spool/db/retry
+sudo rm DIR/spool/db/retry
*
#
#
#
#
#
#
@@
-65,7
+65,7
@@
test message.
****
sleep 1
killdaemon
****
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 fd137b012b41d4b0d684bb3e0a27470fff65e527..a7b3c334ebe34af8d184849b8ee421b0c55c3d15 100644
(file)
--- 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
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
****
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 f663e1aafb82ea5603920f9f346e03f162f4eea7..c50fe2cbcf35fecb443b67b029827aa0b34b1f87 100644
(file)
--- a/
test/scripts/5820-DANE-GnuTLS/5820
+++ b/
test/scripts/5820-DANE-GnuTLS/5820
@@
-130,7
+130,7
@@
Testing
killdaemon
#
#
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 -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 f968930df44e86063c9221ae2f19208b011d3307..c827cc19091796ea3b6746650fc9d53089728a4d 100644
(file)
--- a/
test/scripts/5840-DANE-OpenSSL/5840
+++ b/
test/scripts/5840-DANE-OpenSSL/5840
@@
-132,7
+132,7
@@
Testing
killdaemon
#
#
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 -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 5a8dd3ef213129579c3ff19f59f22824354c59f9..1fdc7e949b7adcc273ddd22fb4ee20755610e082 100644
(file)
--- 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.
****
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 -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 a85c3edda3db9d0a7f333aa3ea1fd67fc06a5727..2c525d838255934651c18db049e2060c03b902a4 100644
(file)
--- 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.
****
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 -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 b9943ce2cca39416d804d2e7fdc0fb34898adc3e..1a736e5a5f0fadf750f634bc7bc6f88aab9e9ea0 100644
(file)
--- 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.
#
# 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
exim -q -d-all+route+dns
****
killdaemon