Testuite: tidying

diff --git a/test/confs/0001 b/test/confs/0001
index 4b7ea85f6614a3207dbfc2671bb70f898b4e7d07..5350ba463f4cdfd260f9b97b164cc4cb1f64af00 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -38,7 +38,7 @@ bounce_return_body = false
 no_bounce_return_message
 return_size_limit = 12K
 bounce_return_size_limit = 10K
 no_bounce_return_message
 return_size_limit = 12K
 bounce_return_size_limit = 10K

-bounce_return_line_limit = 997
+bounce_return_linesize_limit = 997

 callout_domain_negative_expire = 1h
 callout_domain_positive_expire = 1d
 callout_negative_expire = 5h
 callout_domain_negative_expire = 1h
 callout_domain_positive_expire = 1d
 callout_negative_expire = 5h

diff --git a/test/runtest b/test/runtest
index 18eb4cc4e873819390063537e4c92de6d4f65e4b..2b19f52e3f511bdf88f72bfd0e0f08902b6ba9d0 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1393,8 +1393,14 @@ $munges =
     { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/'
     },
 
     { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/'
     },
 

-    'optional_dane_ocsp' =>
-    { 'stdout' => '/^hosts_(requ(est|ire)|try)_(dane|ocsp) =/' },
+    'optional_nossl' =>
+    { 'stdout' => '/^(
+                  dkim_(canon|domain|private_key|selector|sign_headers|strict)
+                  |gnutls_require_(kx|mac|protocols)
+                  |hosts_(requ(est|ire)|try)_(dane|ocsp)
+                  |hosts_(avoid|nopass|require|verify_avoid)_tls
+                  |tls_[^ ]*
+                  )($|[ ]=)/x' },

 
     'sys_bindir' =>
     { 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' },
 
     'sys_bindir' =>
     { 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' },

diff --git a/test/scripts/0000-Basic/0572 b/test/scripts/0000-Basic/0572
index 6bc42fde14a39c78adbd01deea5bc75e45d1c931..05ba658f7e9f373d4ab25c5b142016a262e76c85 100644 (file)
--- a/test/scripts/0000-Basic/0572
+++ b/test/scripts/0000-Basic/0572
@@ -3,7 +3,7 @@
 # Ought to test a non-priv user, checking "hide", but
 # the testsuite cannot do that...
 #
 # Ought to test a non-priv user, checking "hide", but
 # the testsuite cannot do that...
 #

-munge optional_dane_ocsp
+munge optional_nossl

 exim -bP spool_directory
 ****
 perl -e 'print "\n";'
 exim -bP spool_directory
 ****
 perl -e 'print "\n";'

diff --git a/test/stdout/0572 b/test/stdout/0572
index 08b69f4e9e542201bdb4601415b867a235b7f62c..240a2332a0d64fc8196ae3bbfc9c5ee6a20732fb 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -39,12 +39,6 @@ connect_timeout = 5m
 connection_max_messages = 500
 data_timeout = 5m
 delay_after_cutoff
 connection_max_messages = 500
 data_timeout = 5m
 delay_after_cutoff

-dkim_canon = 
-dkim_domain = 
-dkim_private_key = 
-dkim_selector = 
-dkim_sign_headers = 
-dkim_strict = 

 dns_qualify_single
 no_dns_search_parents
 dnssec_request_domains = 
 dns_qualify_single
 no_dns_search_parents
 dnssec_request_domains = 


@@ -53,24 +47,17 @@ dscp =
 fallback_hosts = 
 final_timeout = 10m
 no_gethostbyname
 fallback_hosts = 
 final_timeout = 10m
 no_gethostbyname

-gnutls_require_kx = 
-gnutls_require_mac = 
-gnutls_require_protocols = 

 helo_data = $primary_hostname
 hosts = 
 hosts_avoid_esmtp = 
 hosts_avoid_pipelining = 
 helo_data = $primary_hostname
 hosts = 
 hosts_avoid_esmtp = 
 hosts_avoid_pipelining = 

-hosts_avoid_tls = 

 hosts_max_try = 5
 hosts_max_try_hardlimit = 50
 hosts_max_try = 5
 hosts_max_try_hardlimit = 50

-hosts_nopass_tls = 

 no_hosts_override
 no_hosts_randomize
 hosts_require_auth = 
 no_hosts_override
 no_hosts_randomize
 hosts_require_auth = 

-hosts_require_tls = 

 hosts_try_auth = 
 hosts_try_prdr = *
 hosts_try_auth = 
 hosts_try_prdr = *

-hosts_verify_avoid_tls = 

 interface = ip4.ip4.ip4.ip4
 keepalive
 no_lmtp_ignore_quota
 interface = ip4.ip4.ip4.ip4
 keepalive
 no_lmtp_ignore_quota


@@ -82,17 +69,6 @@ retry_include_ip_address
 serialize_hosts = 
 size_addition = 1024
 socks_proxy = 127.0.0.1 port=1225
 serialize_hosts = 
 size_addition = 1024
 socks_proxy = 127.0.0.1 port=1225

-tls_certificate = 
-tls_crl = 
-tls_dh_min_bits = 1024
-tls_privatekey = 
-tls_require_ciphers = 
-tls_sni = 
-tls_tempfail_tryclear
-tls_try_verify_hosts = *
-tls_verify_cert_hostnames = *
-tls_verify_certificates = system
-tls_verify_hosts = 

 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"


@@ -104,7 +80,6 @@ spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

-tls_advertise_hosts =

 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept