Skip to content

Commit b5cb8ee

Browse files
authored
TestKit: Add TLS feature flags (#612)
1 parent 1c00947 commit b5cb8ee

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

testkitbackend/requests.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ class FrontendError(Exception):
3030
def load_config():
3131
with open(path.join(path.dirname(__file__), "test_config.json"), "r") as fd:
3232
config = json.load(fd)
33-
return (config["skips"],
34-
[k for k, v in config["features"].items() if v is True])
33+
skips = config["skips"]
34+
features = [k for k, v in config["features"].items() if v is True]
35+
import ssl
36+
if ssl.HAS_TLSv1_3:
37+
features += ["Feature:TLS:1.3"]
38+
return skips, features
3539

3640

3741
SKIPPED_TESTS, FEATURES = load_config()

testkitbackend/test_config.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
"stub.authorization.test_authorization.TestAuthorizationV4x1.test_should_fail_on_token_expired_on_begin_using_tx_function":
2424
"Flaky: test requires the driver to contact servers in a specific order",
2525
"stub.session_run_parameters.test_session_run_parameters.TestSessionRunParameters.test_empty_query":
26-
"Driver rejects empty queries before sending it to the server",
27-
"tls.tlsversions.TestTlsVersions.test_1_1":
28-
"TLSv1.1 and below are disabled in the driver"
26+
"Driver rejects empty queries before sending it to the server"
2927
},
3028
"features": {
3129
"Feature:API:Result.Single": "Does not raise error when not exactly one record is available. To be fixed in 5.0",
@@ -35,6 +33,9 @@
3533
"Feature:Auth:Kerberos": true,
3634
"Feature:Bolt:4.4": true,
3735
"Feature:Impersonation": true,
36+
"Feature:TLS:1.1": "Driver blocks TLS 1.1 for security reasons",
37+
"Feature:TLS:1.2": true,
38+
"Feature:TLS:1.3": "Depends on the machine (will be calculated dynamically)",
3839
"AuthorizationExpiredTreatment": true,
3940
"Optimization:ConnectionReuse": true,
4041
"Optimization:EagerTransactionBegin": true,

0 commit comments

Comments
 (0)