Make testcase more robust vs. timing variations

by restricting operations and logging to fewer items of interest

diff --git a/test/confs/2026 b/test/confs/2026
index 4185e0b7978d450c437a934f6996f36266918eb4..d70c5a2dbbe60812fec45593e373e3ab608a2470 100644 (file)
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -5,7 +5,11 @@ host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool

+.ifdef SERVER

 log_file_path = DIR/spool/log/%slog
 log_file_path = DIR/spool/log/%slog

+.else
+log_file_path = DIR/spool/log/%D-%slog
+.endif

 gecos_pattern = ""
 gecos_name = CALLER_NAME
 
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 


@@ -14,6 +18,7 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = check_rcpt
 log_selector = +tls_peerdn
 
 acl_smtp_rcpt = check_rcpt
 log_selector = +tls_peerdn
 

+

 tls_advertise_hosts = HOSTIPV4
 tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1
 tls_advertise_hosts = HOSTIPV4
 tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1


@@ -25,12 +30,12 @@ begin acl
 
 check_rcpt:
   accept  local_parts = userx
 
 check_rcpt:
   accept  local_parts = userx

+          control = queue_only

 
   defer   local_parts = usery
           hosts       = 127.0.0.1
 
 
   defer   local_parts = usery
           hosts       = 127.0.0.1
 

-  accept
-
+  accept  control = queue_only

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 

diff --git a/test/log/2026 b/test/log/2026
index 8c8ab7af0310f0ead3da2fb66a0d262e9da7766b..f016444967d652b37cda38774625fc3d7de9cc9d 100644 (file)
--- a/test/log/2026
+++ b/test/log/2026
@@ -1,13 +1,6 @@
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225

-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 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@myhost.test.ex> temporarily rejected RCPT <usery@myhost.test.ex>
 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@myhost.test.ex> temporarily rejected RCPT <usery@myhost.test.ex>

-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<usery@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary local problem - please try later
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@myhost.test.ex> R=r0 T=t2
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@myhost.test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@myhost.test.ex R=r1 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery <usery@myhost.test.ex> R=r0 T=t2
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 no immediate delivery: queued by ACL

diff --git a/test/scripts/2000-GnuTLS/2026 b/test/scripts/2000-GnuTLS/2026
index 18361c62f25e151da17424689cb060430323a468..e94d7c5d0665a2fa66d8d7559d8a9247ea16c5e7 100644 (file)
--- a/test/scripts/2000-GnuTLS/2026
+++ b/test/scripts/2000-GnuTLS/2026
@@ -7,3 +7,4 @@ exim -odi userx usery
 # Wait to allow delivery to finish before killing the daemon
 sleep 1
 killdaemon
 # Wait to allow delivery to finish before killing the daemon
 sleep 1
 killdaemon

+no_msglog_check