Skip to content

Commit e1fe62f

Browse files
committed
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 <[email protected]>
1 parent 17f254d commit e1fe62f

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

tests/multi_net/sslcontext_server_client.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,14 @@
1515
keyfile = "ec_key.der"
1616

1717
try:
18-
os.stat(certfile)
19-
os.stat(keyfile)
18+
with open(certfile, "rb") as cf:
19+
cert = cadata = cf.read()
20+
with open(keyfile, "rb") as kf:
21+
key = kf.read()
2022
except OSError:
2123
print("SKIP")
2224
raise SystemExit
2325

24-
with open(certfile, "rb") as cf:
25-
cert = cadata = cf.read()
26-
27-
with open(keyfile, "rb") as kf:
28-
key = kf.read()
29-
3026

3127
# Server
3228
def instance0():

tests/multi_net/sslcontext_server_client_ciphers.py

+4-6
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
# These are test certificates. See tests/README.md for details.
1414
cert = cafile = "ec_cert.der"
1515
key = "ec_key.der"
16-
with open(cafile, "rb") as f:
17-
cadata = f.read()
18-
with open(key, "rb") as f:
19-
keydata = f.read()
2016

2117
try:
22-
os.stat(cafile)
23-
os.stat(key)
18+
with open(cafile, "rb") as f:
19+
cadata = f.read()
20+
with open(key, "rb") as f:
21+
keydata = f.read()
2422
except OSError:
2523
print("SKIP")
2624
raise SystemExit

0 commit comments

Comments
 (0)