Skip to content

Commit a4db9c1

Browse files
committed
chore(test/tls)!: Improve stability of PQC-related tests
1 parent b5f3c99 commit a4db9c1

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

test/tls/test_all.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,12 @@ def test_real(self):
184184
TlsCipherSuite.TLS_CHACHA20_POLY1305_SHA256,
185185
]))
186186
self.assertEqual(result.dhparams, None)
187-
self.assertEqual(set(result.curves.curves), set([
188-
TlsNamedCurve.X25519_KYBER_512_DRAFT00,
189-
TlsNamedCurve.X25519_KYBER_768_DRAFT00,
190-
TlsNamedCurve.X25519,
191-
TlsNamedCurve.SECP256R1,
192-
TlsNamedCurve.SECP384R1,
193-
]))
187+
curves = result.curves.curves
188+
# different instances run with different configuration, the following is the common subset
189+
self.assertIn(TlsNamedCurve.X25519_KYBER_512_DRAFT00, curves)
190+
self.assertIn(TlsNamedCurve.X25519_KYBER_768_DRAFT00, curves)
191+
self.assertIn(TlsNamedCurve.X25519, curves)
192+
self.assertIn(TlsNamedCurve.SECP256R1, curves)
194193

195194
def test_markdown(self):
196195
result = self.get_result('rc4-md5.badssl.com', 443)

test/tls/test_curves.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,13 @@ def test_tls_1_3(self):
140140
)
141141

142142
def test_pqc(self):
143-
self.assertEqual(
144-
self.get_result('pq.cloudflareresearch.com', 443, TlsProtocolVersion(TlsVersion.TLS1_3)).curves,
145-
[
146-
TlsNamedCurve.X25519_KYBER_512_DRAFT00,
147-
TlsNamedCurve.X25519_KYBER_768_DRAFT00,
148-
TlsNamedCurve.X25519,
149-
TlsNamedCurve.SECP256R1,
150-
TlsNamedCurve.SECP384R1,
151-
]
152-
)
143+
curves = self.get_result('pq.cloudflareresearch.com', 443, TlsProtocolVersion(TlsVersion.TLS1_3)).curves
144+
145+
# different instances run with different configuration, the following is the common subset
146+
self.assertIn(TlsNamedCurve.X25519_KYBER_512_DRAFT00, curves)
147+
self.assertIn(TlsNamedCurve.X25519_KYBER_768_DRAFT00, curves)
148+
self.assertIn(TlsNamedCurve.X25519, curves)
149+
self.assertIn(TlsNamedCurve.SECP256R1, curves)
153150

154151
def test_plain_text_response(self):
155152
threaded_server = L7ServerTlsTest(

0 commit comments

Comments
 (0)