Update tests for portability.

7 files changed, 7 insertions, 13 deletions

diff --git a/test/confs/0542 b/test/confs/0542
index 7b886eaa1..c3bd7e464 100644
--- a/test/confs/0542
+++ b/test/confs/0542
@@ -12,6 +12,6 @@ gecos_name = CALLER_NAME
 # ----- Main settings -----
 
 queue_only
-
+trusted_users = CALLER
 
 # End
diff --git a/test/confs/0545 b/test/confs/0545
index 1f70fbb9f..56888183d 100644
--- a/test/confs/0545
+++ b/test/confs/0545
@@ -10,6 +10,7 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+disable_ipv6
 
 # ----- Routers -----
 
diff --git a/test/log/0542 b/test/log/0542
index f59faf8b9..88cb89769 100644
--- a/test/log/0542
+++ b/test/log/0542
@@ -1 +1 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userz@test.ex U=userz P=local S=sss
diff --git a/test/scripts/0000-Basic/0461 b/test/scripts/0000-Basic/0461
index 8e6bc2acb..a9fd584df 100644
--- a/test/scripts/0000-Basic/0461
+++ b/test/scripts/0000-Basic/0461
@@ -19,7 +19,7 @@ QUIT
 exim -odi userx@test.ex
 Short message
 ****
-sleep 2
+sleep 3
 server PORT_S
 220 server ready
 EHLO
@@ -62,7 +62,7 @@ Short message
 exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex
 Short message
 ****
-sleep 2
+sleep 3
 exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -q
 ****
 exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex
diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542
index 090c2bf34..da2b9e768 100644
--- a/test/scripts/0000-Basic/0542
+++ b/test/scripts/0000-Basic/0542
@@ -1,5 +1,5 @@
 # -Mset and -bem
-exim userx@test.x usery@test.ex
+exim -f userz@test.ex -oMt userz userx@test.x usery@test.ex
 From: Himself <himself@there.tld>
 To: Yourself <you@here.tld>
 Subject: The subject is not the object
diff --git a/test/stderr/0545 b/test/stderr/0545
index cfe6a114e..ddd5bcc06 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -23,8 +23,6 @@ CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (MX) using fakens
 DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
-DNS lookup of alias-eximtesthost (AAAA) succeeded
-CNAME found: change to eximtesthost.test.ex
 DNS lookup of alias-eximtesthost (A) using fakens
 DNS lookup of alias-eximtesthost (A) succeeded
 CNAME found: change to eximtesthost.test.ex
@@ -49,9 +47,6 @@ DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex-MX: using cached value DNS_NODATA
-DNS lookup of alias-eximtesthost.test.ex (AAAA) succeeded
-CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex-AAAA: using cached value DNS_NODATA
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
@@ -97,8 +92,6 @@ CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (MX) using fakens
 DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
-DNS lookup of alias-eximtesthost.test.ex (AAAA) succeeded
-CNAME found: change to eximtesthost.test.ex
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
diff --git a/test/stdout/0542 b/test/stdout/0542
index a5bce35c5..03dd58a20 100644
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -1,7 +1,7 @@
 > From: Himself <himself@there.tld>
 > Subject: The subject is not the object
 > message_body_size=33
-> message_size=416
+> message_size=369
 > message_id=10HmaX-0005vi-00
 > message_exim_id=10HmaX-0005vi-00
 > recipients=userx@test.x, usery@test.ex