From f303125cee3d00405fd710d64b216ab373fcf0cf Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Mon, 9 Mar 2026 11:53:40 -0700
Subject: [PATCH] PYTHON-5114 Test suite reduce killAllSessions calls (#2721)

---
 test/asynchronous/unified_format.py | 14 +++++++++-----
 test/unified_format.py              | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/test/asynchronous/unified_format.py b/test/asynchronous/unified_format.py
index 6ce8f852c..1fb93e7b8 100644
--- a/test/asynchronous/unified_format.py
+++ b/test/asynchronous/unified_format.py
@@ -1464,11 +1464,6 @@ class UnifiedSpecTestMixinV1(AsyncIntegrationTest):
                 self.assertListEqual(sorted_expected_documents, actual_documents)
 
     async def run_scenario(self, spec, uri=None):
-        # Kill all sessions before and after each test to prevent an open
-        # transaction (from a test failure) from blocking collection/database
-        # operations during test set up and tear down.
-        await self.kill_all_sessions()
-
         # Handle flaky tests.
         flaky_tests = [
             ("PYTHON-5170", ".*test_discovery_and_monitoring.*"),
@@ -1504,6 +1499,15 @@ class UnifiedSpecTestMixinV1(AsyncIntegrationTest):
         if skip_reason is not None:
             raise unittest.SkipTest(f"{skip_reason}")
 
+        # Kill all sessions after each test with transactions to prevent an open
+        # transaction (from a test failure) from blocking collection/database
+        # operations during test set up and tear down.
+        for op in spec["operations"]:
+            name = op["name"]
+            if name == "startTransaction" or name == "withTransaction":
+                self.addAsyncCleanup(self.kill_all_sessions)
+                break
+
         # process createEntities
         self._uri = uri
         self.entity_map = EntityMapUtil(self)
diff --git a/test/unified_format.py b/test/unified_format.py
index 9aee28725..5516a7adf 100644
--- a/test/unified_format.py
+++ b/test/unified_format.py
@@ -1451,11 +1451,6 @@ class UnifiedSpecTestMixinV1(IntegrationTest):
                 self.assertListEqual(sorted_expected_documents, actual_documents)
 
     def run_scenario(self, spec, uri=None):
-        # Kill all sessions before and after each test to prevent an open
-        # transaction (from a test failure) from blocking collection/database
-        # operations during test set up and tear down.
-        self.kill_all_sessions()
-
         # Handle flaky tests.
         flaky_tests = [
             ("PYTHON-5170", ".*test_discovery_and_monitoring.*"),
@@ -1491,6 +1486,15 @@ class UnifiedSpecTestMixinV1(IntegrationTest):
         if skip_reason is not None:
             raise unittest.SkipTest(f"{skip_reason}")
 
+        # Kill all sessions after each test with transactions to prevent an open
+        # transaction (from a test failure) from blocking collection/database
+        # operations during test set up and tear down.
+        for op in spec["operations"]:
+            name = op["name"]
+            if name == "startTransaction" or name == "withTransaction":
+                self.addCleanup(self.kill_all_sessions)
+                break
+
         # process createEntities
         self._uri = uri
         self.entity_map = EntityMapUtil(self)