Update tests for 4.68 (after testing on tahini).

13 files changed, 19 insertions, 18 deletions

diff --git a/test/confs/0206 b/test/confs/0206
index d6621a43f..ca3b96eb7 100644
--- a/test/confs/0206
+++ b/test/confs/0206
@@ -13,7 +13,7 @@ gecos_name = CALLER_NAME
 # ----- Main settings -----
 
 ignore_bounce_errors_after = 2s
-timeout_frozen_after = 4s
+timeout_frozen_after = 5s
 queue_run_in_order
 
 
diff --git a/test/confs/0256 b/test/confs/0256
index 99faa1d76..d17ee8d9f 100644
--- a/test/confs/0256
+++ b/test/confs/0256
@@ -13,7 +13,8 @@ gecos_name = CALLER_NAME
 
 acl_smtp_rcpt = accept
 qualify_domain = test.ex
-errors_copy = *@* ${quote_local_part::abcd+$domain+$local_part}@test.ex
+errors_copy = *@* ${quote_local_part::abcd+$domain+\
+  ${if eq{$local_part}{CALLER}{xxxx}{$local_part}}}@test.ex
 trusted_users = CALLER
 
 
diff --git a/test/confs/0461 b/test/confs/0461
index 3a8907265..5b5110104 100644
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -2,6 +2,8 @@
 
 FALLBACK=fallback_hosts = 127.0.0.1
 ROUTE_DATA=V4NET.0.0.1
+RETRY1=1s
+RETRY2=2s
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
@@ -53,8 +55,8 @@ t2:
 
 begin retry
 
-V4NET.0.0.1  * F,1s,1s
-V4NET.0.0.2  * F,1s,2s
+V4NET.0.0.1  * F,1s,RETRY1
+V4NET.0.0.2  * F,1s,RETRY2
 *            * F,1d,1s
 
 
diff --git a/test/log/0256 b/test/log/0256
index c04aedc55..b6c2ce1cb 100644
--- a/test/log/0256
+++ b/test/log/0256
@@ -2,7 +2,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** unknown@test.ex: Unrouteable address
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd+test.ex+CALLER <abcd+test.ex+CALLER@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd+test.ex+xxxx <abcd+test.ex+xxxx@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= "abc@def"@unknown.domain U=CALLER P=local-smtp S=sss
diff --git a/test/mail/0256.abcd+test.ex+ph10 b/test/mail/0256.abcd+test.ex+xxxx
index 87ed8a038..87ed8a038 100644
--- a/test/mail/0256.abcd+test.ex+ph10
+++ b/test/mail/0256.abcd+test.ex+xxxx
diff --git a/test/runtest b/test/runtest
index 77fe17a13..dab23acec 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# $Cambridge: exim/test/runtest,v 1.29 2007/08/29 15:06:47 ph10 Exp $
+# $Cambridge: exim/test/runtest,v 1.30 2007/08/30 13:35:29 ph10 Exp $
 
 ###############################################################################
 # This is the controlling script for the "new" test suite for Exim. It should #
@@ -339,6 +339,9 @@ while(<IN>)
   s/^\d+:error:/pppp:error:/;
   s/:(?:\/[^\s:]+\/)?([^\/\s]+\.c):\d+:/:$1:dddd:/;
 
+  # There are differences in error messages between OpenSSL versions
+  s/SSL_CTX_set_cipher_list/SSL_connect/;
+
   # One error test in expansions mentions base 62 or 36
   s/is not a base (36|62) number/is not a base 36\/62 number/;
 
diff --git a/test/scripts/0000-Basic/0206 b/test/scripts/0000-Basic/0206
index baf8571ef..6f9968f96 100644
--- a/test/scripts/0000-Basic/0206
+++ b/test/scripts/0000-Basic/0206
@@ -1,12 +1,12 @@
 # timeout_frozen_after with ignore_bounce_errors_after
 sudo exim -odi -f unknown@test.ex nonexist@test.ex freeze@test.ex
 ****
-sleep 2
+sleep 1
 sudo exim -Mf $msg1
 ****
 exim -qf
 ****
-sleep 2
+sleep 3
 exim -q
 ****
 no_msglog_check
diff --git a/test/scripts/0000-Basic/0333 b/test/scripts/0000-Basic/0333
index 1cb3de2e7..92d927e4d 100644
--- a/test/scripts/0000-Basic/0333
+++ b/test/scripts/0000-Basic/0333
@@ -34,4 +34,4 @@ QUIT
 ****
 exim -d-all+route -M $msg1 
 ****
-millisleep 100
+millisleep 500
diff --git a/test/scripts/0000-Basic/0374 b/test/scripts/0000-Basic/0374
index 2bde68338..810efbda5 100644
--- a/test/scripts/0000-Basic/0374
+++ b/test/scripts/0000-Basic/0374
@@ -1,7 +1,7 @@
 # unseen without disable_logging and errors_to = ""
 need_ipv4
 #
-server PORT_S 3
+server -t 10 PORT_S 3
 220
 EHLO
 220 OK
diff --git a/test/scripts/0000-Basic/0461 b/test/scripts/0000-Basic/0461
index 0d89ec1dc..04c1911ed 100644
--- a/test/scripts/0000-Basic/0461
+++ b/test/scripts/0000-Basic/0461
@@ -54,7 +54,7 @@ DATA
 QUIT
 221 OK
 ****
-exim -odi userx@test.ex
+exim -DRETRY1=5s -odi userx@test.ex
 Short message
 ****
 exim -DFALLBACK= -odi userx@test.ex
@@ -64,7 +64,7 @@ exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex
 Short message
 ****
 sleep 3
-exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -q
+exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -DRETRY2=5s -q
 ****
 exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex
 Short message
diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542
index 6b14852b5..0c6362bde 100644
--- a/test/scripts/0000-Basic/0542
+++ b/test/scripts/0000-Basic/0542
@@ -10,7 +10,6 @@ sudo exim -be -Mset $msg1
 From: $h_from:
 Subject: $h_subject:
 message_body_size=$message_body_size
-message_size=$message_size
 message_id=$message_id
 message_exim_id=$message_exim_id
 max_received_linelength=$max_received_linelength
@@ -33,7 +32,6 @@ sudo exim -be -Mset $msg2
 From: $h_from:
 Subject: $h_subject:
 message_body_size=$message_body_size
-message_size=$message_size
 message_id=$message_id
 message_exim_id=$message_exim_id
 max_received_linelength=$max_received_linelength
@@ -51,7 +49,6 @@ exim -bem DIR/test-data
 from: $h_from:
 to: $h_to:
 subject: $h_subject:
-message_size=$message_size
 message_body_size=$message_body_size
 message_exim_id=$message_exim_id
 message_linecount=$message_linecount
diff --git a/test/scripts/0000-Basic/0553 b/test/scripts/0000-Basic/0553
index 07dfb0bed..6ee86a82e 100644
--- a/test/scripts/0000-Basic/0553
+++ b/test/scripts/0000-Basic/0553
@@ -11,6 +11,7 @@ exim -qf
 ****
 sleep 1
 killdaemon
+sleep 1
 #
 # This daemon should flush before delaying
 exim -DSERVER=server -bd -oX PORT_D
diff --git a/test/stdout/0542 b/test/stdout/0542
index a3cb9ef5f..ab29dc9c0 100644
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -1,7 +1,6 @@
 > From: Himself <himself@there.tld>
 > Subject: The subject is not the object
 > message_body_size=71
-> message_size=407
 > message_id=10HmaX-0005vi-00
 > message_exim_id=10HmaX-0005vi-00
 > max_received_linelength=70
@@ -17,7 +16,6 @@
 > From: Himself <himself@there.tld>
 > Subject: The subject is not the object
 > message_body_size=76
-> message_size=416
 > message_id=10HmaY-0005vi-00
 > message_exim_id=10HmaY-0005vi-00
 > max_received_linelength=75
@@ -26,7 +24,6 @@
 > from: A Person <a.person@a.domain.tld>
 > to: First <first@test.ex>, Second <second@test.ex>
 > subject: The subject is moot
-> message_size=197
 > message_body_size=77
 > message_exim_id=10HmaZ-0005vi-00
 > message_linecount=6