From 3274f0355b2df6928bafed8a6dd721c2fdfb65df Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 27 Aug 2025 13:31:18 +1000 Subject: [PATCH] tests/multi_net: Require SSL cert file to be available for test to run. These were missed in 2bba507148e8a751123257fa2b075c70d67e1160 because they didn't use the `os.stat` pattern. Signed-off-by: Damien George --- tests/multi_net/sslcontext_server_client.py | 12 ++++-------- tests/multi_net/sslcontext_server_client_ciphers.py | 12 ++++-------- tests/multi_net/sslcontext_verify_callback.py | 12 ++++-------- tests/multi_net/tls_dtls_server_client.py | 12 ++++-------- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/tests/multi_net/sslcontext_server_client.py b/tests/multi_net/sslcontext_server_client.py index 6516de53f7..fd330cee78 100644 --- a/tests/multi_net/sslcontext_server_client.py +++ b/tests/multi_net/sslcontext_server_client.py @@ -14,14 +14,10 @@ PORT = 8000 certfile = "ec_cert.der" keyfile = "ec_key.der" -try: - with open(certfile, "rb") as cf: - cert = cadata = cf.read() - with open(keyfile, "rb") as kf: - key = kf.read() -except OSError: - print("SKIP") - raise SystemExit +with open(certfile, "rb") as cf: + cert = cadata = cf.read() +with open(keyfile, "rb") as kf: + key = kf.read() # Server diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py index 3334d9d9e4..7017a6f579 100644 --- a/tests/multi_net/sslcontext_server_client_ciphers.py +++ b/tests/multi_net/sslcontext_server_client_ciphers.py @@ -14,14 +14,10 @@ PORT = 8000 cert = cafile = "ec_cert.der" key = "ec_key.der" -try: - with open(cafile, "rb") as f: - cadata = f.read() - with open(key, "rb") as f: - keydata = f.read() -except OSError: - print("SKIP") - raise SystemExit +with open(cafile, "rb") as f: + cadata = f.read() +with open(key, "rb") as f: + keydata = f.read() # Server diff --git a/tests/multi_net/sslcontext_verify_callback.py b/tests/multi_net/sslcontext_verify_callback.py index 74b9738245..80056a5868 100644 --- a/tests/multi_net/sslcontext_verify_callback.py +++ b/tests/multi_net/sslcontext_verify_callback.py @@ -15,14 +15,10 @@ PORT = 8000 cert = cafile = "ec_cert.der" key = "ec_key.der" -try: - with open(cafile, "rb") as f: - cadata = f.read() - with open(key, "rb") as f: - key = f.read() -except OSError: - print("SKIP") - raise SystemExit +with open(cafile, "rb") as f: + cadata = f.read() +with open(key, "rb") as f: + key = f.read() def verify_callback(cert, depth): diff --git a/tests/multi_net/tls_dtls_server_client.py b/tests/multi_net/tls_dtls_server_client.py index a81c4cb282..ec7d7de55f 100644 --- a/tests/multi_net/tls_dtls_server_client.py +++ b/tests/multi_net/tls_dtls_server_client.py @@ -13,14 +13,10 @@ PORT = 8000 certfile = "ec_cert.der" keyfile = "ec_key.der" -try: - with open(certfile, "rb") as cf: - cert = cadata = cf.read() - with open(keyfile, "rb") as kf: - key = kf.read() -except OSError: - print("SKIP") - raise SystemExit +with open(certfile, "rb") as cf: + cert = cadata = cf.read() +with open(keyfile, "rb") as kf: + key = kf.read() # DTLS server.