diff --git a/testkitbackend/requests.py b/testkitbackend/requests.py index 09a2c972..d043ee1e 100644 --- a/testkitbackend/requests.py +++ b/testkitbackend/requests.py @@ -75,22 +75,27 @@ def NewDriver(backend, data): **auth_token.get("parameters", {}) ) auth_token.mark_item_as_read("parameters", recursive=True) - resolver = None + kwargs = {} if data["resolverRegistered"] or data["domainNameResolverRegistered"]: - resolver = resolution_func(backend, data["resolverRegistered"], - data["domainNameResolverRegistered"]) - connection_timeout = data.get("connectionTimeoutMs") - if connection_timeout is not None: - connection_timeout /= 1000 - max_transaction_retry_time = data.get("maxTxRetryTimeMs") - if max_transaction_retry_time is not None: - max_transaction_retry_time /= 1000 + kwargs["resolver"] = resolution_func( + backend, data["resolverRegistered"], + data["domainNameResolverRegistered"] + ) + if data.get("connectionTimeoutMs"): + kwargs["connection_timeout"] = data["connectionTimeoutMs"] / 1000 + if data.get("maxTxRetryTimeMs"): + kwargs["max_transaction_retry_time"] = data["maxTxRetryTimeMs"] / 1000 + if data.get("connectionAcquisitionTimeoutMs"): + kwargs["connection_acquisition_timeout"] = \ + data["connectionAcquisitionTimeoutMs"] / 1000 + if data.get("maxConnectionPoolSize"): + kwargs["max_connection_pool_size"] = data["maxConnectionPoolSize"] + if data.get("fetchSize"): + kwargs["fetch_size"] = data["fetchSize"] + data.mark_item_as_read("domainNameResolverRegistered") driver = neo4j.GraphDatabase.driver( - data["uri"], auth=auth, user_agent=data["userAgent"], - resolver=resolver, connection_timeout=connection_timeout, - fetch_size=data.get("fetchSize"), - max_transaction_retry_time=max_transaction_retry_time, + data["uri"], auth=auth, user_agent=data["userAgent"], **kwargs ) key = backend.next_key() backend.drivers[key] = driver diff --git a/testkitbackend/test_config.json b/testkitbackend/test_config.json index 75be83bd..7bd55eec 100644 --- a/testkitbackend/test_config.json +++ b/testkitbackend/test_config.json @@ -26,6 +26,7 @@ "Driver rejects empty queries before sending it to the server" }, "features": { + "Feature:API:Liveness.Check": false, "Feature:API:Result.List": true, "Feature:API:Result.Peek": true, "Feature:API:Result.Single": "Does not raise error when not exactly one record is available. To be fixed in 5.0.", @@ -53,8 +54,12 @@ "Temporary:CypherPathAndRelationship": true, "Temporary:DriverFetchSize": true, "Temporary:DriverMaxTxRetryTime": true, + "Temporary:FastFailingDiscovery": true, "Temporary:FullSummary": true, "Temporary:ResultKeys": true, - "Temporary:TransactionClose": true + "Temporary:TransactionClose": true, + "Temporary:DriverMaxConnectionPoolSize": true, + "Temporary:ConnectionAcquisitionTimeout": true, + "Temporary:GetConnectionPoolMetrics": true } }