summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2014-10-29 12:57:00 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2014-10-29 12:57:30 +0000
commit74377a628b6e2c85973aa741c4233726d4d8c0df (patch)
treef223a2f41db896476bd56fd2d61aae283f723ee1 /test
parenta719fce4b1d9f9f03a8f1f083375625728199786 (diff)
Testsuite: tidying
Diffstat (limited to 'test')
-rwxr-xr-xtest/runtest10
-rw-r--r--test/scripts/0000-Basic/03904
-rw-r--r--test/scripts/5420-cutthrough-GnuTLS/54203
-rw-r--r--test/stderr/54202
-rw-r--r--test/stdout/10062
5 files changed, 14 insertions, 7 deletions
diff --git a/test/runtest b/test/runtest
index 166a701e1..8435fccfc 100755
--- a/test/runtest
+++ b/test/runtest
@@ -485,7 +485,7 @@ RESET_AFTER_EXTRA_LINE_READ:
s/\d\d-[A-Z][a-z]{2}-\d{4}\s\d\d:\d\d:\d\d/07-Mar-2000 12:21:52/g;
# Time on queue tolerance
- s/QT=1s/QT=0s/;
+ s/(QT|D)=1s/$1=0s/;
# Eximstats heading
s/Exim\sstatistics\sfrom\s\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\sto\s
@@ -1290,6 +1290,7 @@ return 1;
# paniclog, rejectlog, mainlog, stdout, stderr, msglog, mail
# Search strings starting with 's' do substitutions;
# with '/' do line-skips.
+# Triggered by a scriptfile line "munge <name>"
##################################################
$munges =
{ 'dnssec' =>
@@ -1301,8 +1302,11 @@ $munges =
'gnutls_handshake' =>
{ 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/', },
- 'tpda' =>
- { 'stdout' => '/tpda_event_action =/', },
+ 'optional_events' =>
+ { 'stdout' => '/event_action =/', },
+
+ 'optional_ocsp' =>
+ { 'stderr' => '/127.0.0.1 in hosts_requ(ire|est)_ocsp/', },
};
diff --git a/test/scripts/0000-Basic/0390 b/test/scripts/0000-Basic/0390
index 9d3d3ea61..8548d8eff 100644
--- a/test/scripts/0000-Basic/0390
+++ b/test/scripts/0000-Basic/0390
@@ -1,5 +1,7 @@
# .ifdef etc
-munge tpda
+#
+munge optional_events
+#
exim -bP accept_8bitmime acl_not_smtp acl_smtp_auth acl_smtp_connect acl_smtp_data acl_smtp_etrn acl_smtp_expn acl_smtp_mail acl_smtp_rcpt acl_smtp_vrfy
****
exim -DAA -bP accept_8bitmime acl_not_smtp acl_smtp_auth acl_smtp_connect acl_smtp_data acl_smtp_etrn acl_smtp_expn acl_smtp_mail acl_smtp_rcpt acl_smtp_vrfy
diff --git a/test/scripts/5420-cutthrough-GnuTLS/5420 b/test/scripts/5420-cutthrough-GnuTLS/5420
index 446bcc667..001e7ae67 100644
--- a/test/scripts/5420-cutthrough-GnuTLS/5420
+++ b/test/scripts/5420-cutthrough-GnuTLS/5420
@@ -1,4 +1,7 @@
# cutthrough_delivery to target offering TLS
+#
+munge optional_ocsp
+#
exim -DSERVER=server -bd -oX PORT_D
****
exim -d-all+acl+transport+expand+lists -bs
diff --git a/test/stderr/5420 b/test/stderr/5420
index 5694e911f..64dfc0b12 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -81,8 +81,6 @@ expanding: ${if eq {$address_data}{userz}{*}{:}}
127.0.0.1 in hosts_verify_avoid_tls? no (end of list)
SMTP>> STARTTLS
SMTP<< 220 TLS go ahead
-127.0.0.1 in hosts_require_ocsp? no (option unset)
-127.0.0.1 in hosts_request_ocsp? yes (matched "*")
in tls_verify_hosts? no (option unset)
in tls_try_verify_hosts? no (option unset)
SMTP>> EHLO myhost.test.ex
diff --git a/test/stdout/1006 b/test/stdout/1006
index c131da929..87903f4ea 100644
--- a/test/stdout/1006
+++ b/test/stdout/1006
@@ -23,4 +23,4 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
??? 221
<<< 221 myhost.test.ex closing connection
End of script
-Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... failed: Connection refused
+Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connect failed: Connection refused