googleapis
diff --git a/‎packages/google-cloud-ndb/google/cloud/ndb/_cache.py‎
Lines changed: 1 addition & 1 deletion b/‎packages/google-cloud-ndb/google/cloud/ndb/_cache.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/google-cloud-ndb/tests/conftest.py‎
Lines changed: 22 additions & 13 deletions b/‎packages/google-cloud-ndb/tests/conftest.py‎
Lines changed: 22 additions & 13 deletions
@@ -683,7 +683,7 @@ def _update_key(key, new_value):
         utils.logging_debug(log, "old value: {}", old_value)
 
         value = new_value(old_value)
-        utils.logging_debug(log, "new value: {}", value)
+        utils.logging_debug(log, "new value: {}", value)  # pragma: SYNCPOINT update key
 
         if old_value is not None:
             utils.logging_debug(log, "compare and swap")
 
@@ -88,22 +88,31 @@ def initialize_environment(request, environ):
 
 
 @pytest.fixture
-def context():
-    client = mock.Mock(
-        project="testing",
-        namespace=None,
-        spec=("project", "namespace"),
-        stub=mock.Mock(spec=()),
-    )
-    context = context_module.Context(
-        client,
-        eventloop=TestingEventLoop(),
-        datastore_policy=True,
-        legacy_data=False,
-    )
+def context_factory():
+    def context(**kwargs):
+        client = mock.Mock(
+            project="testing",
+            namespace=None,
+            spec=("project", "namespace"),
+            stub=mock.Mock(spec=()),
+        )
+        context = context_module.Context(
+            client,
+            eventloop=TestingEventLoop(),
+            datastore_policy=True,
+            legacy_data=False,
+            **kwargs
+        )
+        return context
+
     return context
 
 
+@pytest.fixture
+def context(context_factory):
+    return context_factory()
+
+
 @pytest.fixture
 def in_context(context):
     assert not context_module._state.context