git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: avoid using STARTTLS in a non-TLS testcase
[users/heiko/exim.git]
/
test
/
confs
/
0495
diff --git
a/test/confs/0495
b/test/confs/0495
index b33cbf1ef89f50a617e5155aa16a06aac21328ec..dc1a394b0a4c3f82d031fab9a98676a03ca214a2 100644
(file)
--- a/
test/confs/0495
+++ b/
test/confs/0495
@@
-1,13
+1,8
@@
# Exim test configuration 0495
# Exim test configuration 0495
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-69,7
+64,7
@@
t1:
driver = smtp
hosts = 127.0.0.1 : HOSTIPV4
port = PORT_S
driver = smtp
hosts = 127.0.0.1 : HOSTIPV4
port = PORT_S
- interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
+ hosts_try_fastopen = :
allow_localhost
command_timeout = 1s
allow_localhost
command_timeout = 1s
@@
-77,6
+72,7
@@
t2:
driver = smtp
hosts = V4NET.9.8.7
port = PORT_S
driver = smtp
hosts = V4NET.9.8.7
port = PORT_S
+ hosts_try_fastopen = :
t3:
driver = appendfile
t3:
driver = appendfile
@@
-87,5
+83,6
@@
t4:
driver = smtp
hosts = V4NET.10.10.10
port = nonexistent
driver = smtp
hosts = V4NET.10.10.10
port = nonexistent
+ hosts_try_fastopen = :
# End
# End