summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2020-08-27 21:15:19 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2020-08-31 13:21:12 +0100
commitb38a477da0a5248ed1d2b7590922c89c6337ec3b (patch)
tree98bb7d769cce9a0bba9b2c086327c468e3c5ad46 /test
parentd79247e6321bd44f4f21bc1234e0424d0fa558eb (diff)
Fix non-TLS build
Diffstat (limited to 'test')
-rw-r--r--test/confs/20353
-rw-r--r--test/confs/21355
-rw-r--r--test/stderr/20353
-rw-r--r--test/stderr/21352
4 files changed, 5 insertions, 8 deletions
diff --git a/test/confs/2035 b/test/confs/2035
index f7f225746..402239022 100644
--- a/test/confs/2035
+++ b/test/confs/2035
@@ -66,7 +66,8 @@ client:
begin transports
t1:
- driver = smtp
+ driver = smtp
+ port = PORT_D
tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
tls_verify_cert_hostnames = :
diff --git a/test/confs/2135 b/test/confs/2135
index 4625f759d..7f1e9906b 100644
--- a/test/confs/2135
+++ b/test/confs/2135
@@ -66,8 +66,9 @@ client:
begin transports
t1:
- driver = smtp
- hosts_try_fastopen = :
+ driver = smtp
+ port = PORT_D
+ hosts_try_fastopen = :
tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
tls_verify_cert_hostnames = :
diff --git a/test/stderr/2035 b/test/stderr/2035
index 7187d0d3e..5a69f577f 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -3,7 +3,6 @@ configuration file is TESTSUITE/test-config
admin user
LOG: smtp_connection MAIN
SMTP connection from CALLER
-Transport port=25 replaced by host-specific port=1225
Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
@@ -53,8 +52,6 @@ already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
checking status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex)
-Transport port=25 replaced by host-specific port=1225
-Transport port=25 replaced by host-specific port=1225
continued connection, proxied TLS
SMTP>> DATA
cmd buf flush ddd bytes
diff --git a/test/stderr/2135 b/test/stderr/2135
index 70759060f..5a69f577f 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -3,7 +3,6 @@ configuration file is TESTSUITE/test-config
admin user
LOG: smtp_connection MAIN
SMTP connection from CALLER
-Transport port=25 replaced by host-specific port=1225
Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
@@ -53,7 +52,6 @@ already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
checking status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex)
-Transport port=25 replaced by host-specific port=1225
continued connection, proxied TLS
SMTP>> DATA
cmd buf flush ddd bytes