Skip to content

Commit a2d7d33

Browse files
Merge pull request #912 from neo4j/testkit/expect-null-accessmode
Handle testkit sending null access mode
2 parents 6002a8c + 4eb4d52 commit a2d7d33

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

testkitbackend/_async/requests.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -536,18 +536,18 @@ def __init__(self, session):
536536

537537
async def NewSession(backend, data):
538538
driver = backend.drivers[data["driverId"]]
539-
access_mode = data["accessMode"]
540539
expected_warnings = []
541-
if access_mode == "r":
542-
access_mode = neo4j.READ_ACCESS
543-
elif access_mode == "w":
544-
access_mode = neo4j.WRITE_ACCESS
545-
else:
546-
raise ValueError("Unknown access mode:" + access_mode)
547540
config = {
548-
"default_access_mode": access_mode,
549541
"database": data["database"],
550542
}
543+
access_mode = data["accessMode"]
544+
if access_mode is not None:
545+
if access_mode == "r":
546+
config["default_access_mode"] = neo4j.READ_ACCESS
547+
elif access_mode == "w":
548+
config["default_access_mode"] = neo4j.WRITE_ACCESS
549+
else:
550+
raise ValueError("Unknown access mode:" + access_mode)
551551
if data.get("bookmarks") is not None:
552552
config["bookmarks"] = neo4j.Bookmarks.from_raw_values(
553553
data["bookmarks"]

testkitbackend/_sync/requests.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -536,18 +536,18 @@ def __init__(self, session):
536536

537537
def NewSession(backend, data):
538538
driver = backend.drivers[data["driverId"]]
539-
access_mode = data["accessMode"]
540539
expected_warnings = []
541-
if access_mode == "r":
542-
access_mode = neo4j.READ_ACCESS
543-
elif access_mode == "w":
544-
access_mode = neo4j.WRITE_ACCESS
545-
else:
546-
raise ValueError("Unknown access mode:" + access_mode)
547540
config = {
548-
"default_access_mode": access_mode,
549541
"database": data["database"],
550542
}
543+
access_mode = data["accessMode"]
544+
if access_mode is not None:
545+
if access_mode == "r":
546+
config["default_access_mode"] = neo4j.READ_ACCESS
547+
elif access_mode == "w":
548+
config["default_access_mode"] = neo4j.WRITE_ACCESS
549+
else:
550+
raise ValueError("Unknown access mode:" + access_mode)
551551
if data.get("bookmarks") is not None:
552552
config["bookmarks"] = neo4j.Bookmarks.from_raw_values(
553553
data["bookmarks"]

0 commit comments

Comments
 (0)