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:
a719fce
)
Testsuite: tidying
author
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 29 Oct 2014 12:57:00 +0000
(12:57 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 29 Oct 2014 12:57:30 +0000
(12:57 +0000)
test/runtest
patch
|
blob
|
history
test/scripts/0000-Basic/0390
patch
|
blob
|
history
test/scripts/5420-cutthrough-GnuTLS/5420
patch
|
blob
|
history
test/stderr/5420
patch
|
blob
|
history
test/stdout/1006
patch
|
blob
|
history
diff --git
a/test/runtest
b/test/runtest
index 166a701e1c8266ccc910fde9d206aaacf573508e..8435fccfcf5691b4b0fe3ccfa988a1026dfbcd40 100755
(executable)
--- 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/\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
# 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.
# 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' =>
##################################################
$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/', },
'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 9d3d3ea61601a8a8ea82ae58ce01c20cdd1841e8..8548d8efff87b5202bc8deda99c524df04d78e7a 100644
(file)
--- a/
test/scripts/0000-Basic/0390
+++ b/
test/scripts/0000-Basic/0390
@@
-1,5
+1,7
@@
# .ifdef etc
# .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
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 446bcc667f066e4d585816cb23ef8456a8e21d69..001e7ae67d183c8dd865a5300a12b961412b09ab 100644
(file)
--- a/
test/scripts/5420-cutthrough-GnuTLS/5420
+++ b/
test/scripts/5420-cutthrough-GnuTLS/5420
@@
-1,4
+1,7
@@
# cutthrough_delivery to target offering TLS
# cutthrough_delivery to target offering TLS
+#
+munge optional_ocsp
+#
exim -DSERVER=server -bd -oX PORT_D
****
exim -d-all+acl+transport+expand+lists -bs
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 5694e911f662ca2d6ada0463ebcd519f058814bf..64dfc0b120ade59132fceace717ea40a6ffe1e34 100644
(file)
--- 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_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
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 c131da929ac497f655279acda21d923eb4711d36..87903f4ea711d439a94a9a28c39a4cc0298cabd1 100644
(file)
--- 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
??? 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