diff options
author | Damien George <damien@micropython.org> | 2024-07-25 16:51:07 +1000 |
---|---|---|
committer | Damien George <damien@micropython.org> | 2024-07-25 18:14:52 +1000 |
commit | e1fe62f4fca9506980bb19bbc973bf21740625e0 (patch) | |
tree | 2ee5dfb0a2edde5779a867e0cecd56c27a756230 /tests | |
parent | 17f254df3589ce4a127ad4575ed2c031d5ab81b3 (diff) | |
download | micropython-e1fe62f4fca9506980bb19bbc973bf21740625e0.tar.gz micropython-e1fe62f4fca9506980bb19bbc973bf21740625e0.zip |
tests/multi_net: Fix skipping of SSLContext tests when .der don't exist.
The `sslcontext_server_client_ciphers.py` test was using stat to test for
the .der files after it already tried to open them for reading. That is
now fixed. And `sslcontext_server_client.py` is adjusted to use the same
pattern for skipping the test.
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/multi_net/sslcontext_server_client.py | 12 | ||||
-rw-r--r-- | tests/multi_net/sslcontext_server_client_ciphers.py | 10 |
2 files changed, 8 insertions, 14 deletions
diff --git a/tests/multi_net/sslcontext_server_client.py b/tests/multi_net/sslcontext_server_client.py index 473c9c376e..6516de53f7 100644 --- a/tests/multi_net/sslcontext_server_client.py +++ b/tests/multi_net/sslcontext_server_client.py @@ -15,18 +15,14 @@ certfile = "ec_cert.der" keyfile = "ec_key.der" try: - os.stat(certfile) - os.stat(keyfile) + 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 def instance0(): diff --git a/tests/multi_net/sslcontext_server_client_ciphers.py b/tests/multi_net/sslcontext_server_client_ciphers.py index c168b444a9..3334d9d9e4 100644 --- a/tests/multi_net/sslcontext_server_client_ciphers.py +++ b/tests/multi_net/sslcontext_server_client_ciphers.py @@ -13,14 +13,12 @@ PORT = 8000 # These are test certificates. See tests/README.md for details. cert = cafile = "ec_cert.der" key = "ec_key.der" -with open(cafile, "rb") as f: - cadata = f.read() -with open(key, "rb") as f: - keydata = f.read() try: - os.stat(cafile) - os.stat(key) + with open(cafile, "rb") as f: + cadata = f.read() + with open(key, "rb") as f: + keydata = f.read() except OSError: print("SKIP") raise SystemExit |