Skip to content

Commit 5f32660

Browse files
committed
Add TestKit backend message TransactionClose
+ catch up with temp testkit feature flags + fixed alphabetical order in `testkitbackend/test_config.json` + implement fetchSize parameter in NewDriver
1 parent 4b9ad52 commit 5f32660

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

testkitbackend/requests.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,18 @@ def NewDriver(backend, data):
6262
if data["resolverRegistered"] or data["domainNameResolverRegistered"]:
6363
resolver = resolution_func(backend, data["resolverRegistered"],
6464
data["domainNameResolverRegistered"])
65-
connection_timeout = data.get("connectionTimeoutMs", None)
65+
connection_timeout = data.get("connectionTimeoutMs")
6666
if connection_timeout is not None:
6767
connection_timeout /= 1000
68+
max_transaction_retry_time = data.get("maxTxRetryTimeMs")
69+
if max_transaction_retry_time is not None:
70+
max_transaction_retry_time /= 1000
6871
data.mark_item_as_read("domainNameResolverRegistered")
6972
driver = neo4j.GraphDatabase.driver(
7073
data["uri"], auth=auth, user_agent=data["userAgent"],
71-
resolver=resolver, connection_timeout=connection_timeout
74+
resolver=resolver, connection_timeout=connection_timeout,
75+
fetch_size=data.get("fetchSize"),
76+
max_transaction_retry_time=max_transaction_retry_time,
7277
)
7378
key = backend.next_key()
7479
backend.drivers[key] = driver
@@ -291,6 +296,13 @@ def TransactionRollback(backend, data):
291296
backend.send_response("Transaction", {"id": key})
292297

293298

299+
def TransactionClose(backend, data):
300+
key = data["txId"]
301+
tx = backend.transactions[key]
302+
tx.close()
303+
backend.send_response("Transaction", {"id": key})
304+
305+
294306
def ResultNext(backend, data):
295307
result = backend.results[data["resultId"]]
296308
try:

testkitbackend/test_config.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,18 @@
4141
"Feature:API:Result.Single": "Does not raise error when not exactly one record is available. To be fixed in 5.0",
4242
"Feature:API:Result.Peek": true,
4343
"AuthorizationExpiredTreatment": true,
44+
"Optimization:ConnectionReuse": true,
45+
"Optimization:EagerTransactionBegin": true,
4446
"Optimization:ImplicitDefaultArguments": true,
4547
"Optimization:MinimalResets": true,
46-
"Optimization:ConnectionReuse": true,
4748
"Optimization:PullPipelining": true,
4849
"ConfHint:connection.recv_timeout_seconds": true,
49-
"Temporary:ResultKeys": true,
50+
"Temporary:CypherPathAndRelationship": true,
51+
"Temporary:DriverFetchSize": true,
52+
"Temporary:DriverMaxTxRetryTime": true,
5053
"Temporary:FullSummary": true,
51-
"Temporary:CypherPathAndRelationship": true
54+
"Temporary:ResultKeys": true,
55+
"Temporary:ResultList": "requires further specification/discussion in the team",
56+
"Temporary:TransactionClose": true
5257
}
5358
}

0 commit comments

Comments
 (0)