From db7b2b67dd6c39491fb19c96a9ed95f14fb38e43 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 13 Oct 2020 19:59:43 +0100 Subject: [PATCH] Testsuite: munge & delay for early selfsign generate Broken-by: 48e9099006 --- test/runtest | 6 +++++- test/scripts/0000-Basic/0433 | 6 ++++++ test/scripts/0000-Basic/0438 | 2 ++ test/scripts/1000-Basic-ipv6/1007 | 8 ++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/test/runtest b/test/runtest index cd4b7a219..1f3da963f 100755 --- a/test/runtest +++ b/test/runtest @@ -1072,12 +1072,13 @@ RESET_AFTER_EXTRA_LINE_READ: # TLS preload # only OpenSSL speaks of these - next if /^TLS: preloading (DH params|ECDH curve|CA bundle) for server/; + next if /^TLS: (preloading (DH params|ECDH curve|CA bundle) for server|generating selfsigned server cert)/; next if /^Diffie-Hellman initialized from default/; next if /^ECDH OpenSSL (< )?[\d.+]+: temp key parameter settings:/; next if /^ECDH: .*'prime256v1'/; next if /^tls_verify_certificates: system$/; next if /^tls_set_watch: .*\/cert.pem/; + next if /^Generating 2048 bit RSA key/; # TLS preload # only GnuTLS speaks of these @@ -1086,6 +1087,8 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^TLS: preloading cipher list for server: NULL$/; s/^GnuTLS using default session cipher\/priority "NORMAL"$/TLS: not preloading cipher list for server/; next if /^GnuTLS<2>: added \d+ protocols, \d+ ciphersuites, \d+ sig algos and \d+ groups into priority list$/; + next if /^GnuTLS<2>: (Disabling X.509 extensions|signing structure using RSA-SHA256)/; + next if /^GnuTLS.*(wrap_nettle_mpi_print|gnutls_subject_alt_names_get|get_alt_name)/; # only kevent platforms (FreeBSD, OpenBSD) say this next if /^watch dir/; @@ -1094,6 +1097,7 @@ RESET_AFTER_EXTRA_LINE_READ: # TLS preload # there happen in different orders for OpenSSL/GnuTLS/noTLS + next if /^TLS: generating selfsigned server cert/; next if /^TLS: not preloading (CA bundle|cipher list) for server$/; next if /^TLS: not preloading server certs$/; diff --git a/test/scripts/0000-Basic/0433 b/test/scripts/0000-Basic/0433 index 995259e8a..07e3172c9 100644 --- a/test/scripts/0000-Basic/0433 +++ b/test/scripts/0000-Basic/0433 @@ -3,19 +3,25 @@ need_ipv4 # exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:PORT_D2 **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:PORT_D2 -DIFACE='local_interfaces = <; 127.0.0.1.PORT_D4 ; 0.0.0.0' **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:PORT_D2 -DIFACE='local_interfaces = <; 0.0.0.0; 127.0.0.1.PORT_D4' **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -oX PORT_D3 -DPORT=daemon_smtp_port=PORT_D:PORT_D2 -DIFACE='local_interfaces = <; 127.0.0.1.PORT_D4 ; 0.0.0.0' **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -oX '<; 0.0.0.0.PORT_D;0.0.0.0.PORT_D2' **** +millisleep 1000 killdaemon diff --git a/test/scripts/0000-Basic/0438 b/test/scripts/0000-Basic/0438 index 28795d83a..eb6daf3d5 100644 --- a/test/scripts/0000-Basic/0438 +++ b/test/scripts/0000-Basic/0438 @@ -3,10 +3,12 @@ need_ipv4 # exim -d -DSERVER=server -bd -oX PORT_D **** +millisleep 1000 killdaemon # PID file must be DIR/spool/exim-daemon.* in order for "killdaemon" to work exim -d -DSERVER=server -bd -oX PORT_D -oP DIR/spool/exim-daemon.anotherpid **** +millisleep 1000 killdaemon # # Check for a SIGTERM daemon kill removing the pid file diff --git a/test/scripts/1000-Basic-ipv6/1007 b/test/scripts/1000-Basic-ipv6/1007 index 9a2cbd638..d1ef8df76 100644 --- a/test/scripts/1000-Basic-ipv6/1007 +++ b/test/scripts/1000-Basic-ipv6/1007 @@ -4,25 +4,33 @@ need_ipv6 # exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:PORT_D2 **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:PORT_D2 -DIFACE='local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0' **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:PORT_D2 -DIFACE='local_interfaces = <; 0.0.0.0; 127.0.0.1.PORT_D4 ; ::0' **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:PORT_D2 -DIFACE='local_interfaces = <; HOSTIPV6' **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -oX PORT_D3 -DPORT=daemon_smtp_port=PORT_D:PORT_D2 -DIFACE='local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0' **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -oX '<; PORT_D3;PORT_D;127.0.0.1' -DPORT=daemon_smtp_port=PORT_D:PORT_D2 -DIFACE='local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0' **** +millisleep 1000 killdaemon exim -d -bd -DSERVER=server -oX '<; ::0.PORT_D; 0.0.0.0.PORT_D;0.0.0.0.PORT_D2' **** +millisleep 1000 killdaemon -- 2.30.2