summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2015-09-30 18:05:10 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2015-09-30 18:58:34 +0100
commitb3765932b14d24fbc54b3f83e2fe865df48bc2f3 (patch)
treeffa919d81ac475383a7833e3dac7b2aa91774f50
parent7e09992e0fb2d70750a686939636cf40f2a06ae3 (diff)
Testsuite: nail testcase to ipv4 to avoid output difference in non-6 build
-rw-r--r--test/confs/22011
-rw-r--r--test/scripts/2200-dnsdb/22011
-rw-r--r--test/stderr/22011
3 files changed, 2 insertions, 1 deletions
diff --git a/test/confs/2201 b/test/confs/2201
index 7b257cce3..a4a44d4da 100644
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -11,6 +11,7 @@ gecos_name = CALLER_NAME
# ----- Main settings -----
trusted_users = CALLER
+disable_ipv6
acl_smtp_rcpt = check_rcpt
acl_not_smtp = check_sndr
diff --git a/test/scripts/2200-dnsdb/2201 b/test/scripts/2200-dnsdb/2201
index d432ca187..d09cde2d2 100644
--- a/test/scripts/2200-dnsdb/2201
+++ b/test/scripts/2200-dnsdb/2201
@@ -1,4 +1,5 @@
# query-style lookup in domains, local_parts, senders
+need_ipv4
munge debug_pid
exim -d -bt test.ex@test.ex unknown@test.ex
****
diff --git a/test/stderr/2201 b/test/stderr/2201
index 523ae4395..2d50418f7 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -193,7 +193,6 @@ trusted user
admin user
ppppp daemon_smtp_port overridden by -oX:
ppppp <: 1225
-ppppp listening on all interfaces (IPv6) port 1225
ppppp listening on all interfaces (IPv4) port 1225
ppppp pid written to TESTSUITE/spool/exim-daemon.pid
ppppp LOG: MAIN