Skip to content

Commit e773c77

Browse files
committed
Fix test_sensitive_commands
1 parent 6895a66 commit e773c77

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

test/asynchronous/test_monitoring.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,11 +1101,13 @@ async def test_first_batch_helper(self):
11011101

11021102
@async_client_context.require_version_max(6, 1, 99)
11031103
async def test_sensitive_commands(self):
1104-
listeners = self.client._event_listeners
1104+
listener = EventListener()
1105+
client = await self.async_rs_or_single_client(event_listeners=[listener])
1106+
listeners = client._event_listeners
11051107

1106-
self.listener.reset()
1108+
listener.reset()
11071109
cmd = SON([("getnonce", 1)])
1108-
listeners.publish_command_start(cmd, "pymongo_test", 12345, await self.client.address, None) # type: ignore[arg-type]
1110+
listeners.publish_command_start(cmd, "pymongo_test", 12345, await client.address, None) # type: ignore[arg-type]
11091111
delta = datetime.timedelta(milliseconds=100)
11101112
listeners.publish_command_success(
11111113
delta,
@@ -1116,15 +1118,15 @@ async def test_sensitive_commands(self):
11161118
None,
11171119
database_name="pymongo_test",
11181120
)
1119-
started = self.listener.started_events[0]
1120-
succeeded = self.listener.succeeded_events[0]
1121-
self.assertEqual(0, len(self.listener.failed_events))
1121+
started = listener.started_events[0]
1122+
succeeded = listener.succeeded_events[0]
1123+
self.assertEqual(0, len(listener.failed_events))
11221124
self.assertIsInstance(started, monitoring.CommandStartedEvent)
11231125
self.assertEqual({}, started.command)
11241126
self.assertEqual("pymongo_test", started.database_name)
11251127
self.assertEqual("getnonce", started.command_name)
11261128
self.assertIsInstance(started.request_id, int)
1127-
self.assertEqual(await self.client.address, started.connection_id)
1129+
self.assertEqual(await client.address, started.connection_id)
11281130
self.assertIsInstance(succeeded, monitoring.CommandSucceededEvent)
11291131
self.assertEqual(succeeded.duration_micros, 100000)
11301132
self.assertEqual(started.command_name, succeeded.command_name)

test/test_monitoring.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,11 +1101,13 @@ def test_first_batch_helper(self):
11011101

11021102
@client_context.require_version_max(6, 1, 99)
11031103
def test_sensitive_commands(self):
1104-
listeners = self.client._event_listeners
1104+
listener = EventListener()
1105+
client = self.rs_or_single_client(event_listeners=[listener])
1106+
listeners = client._event_listeners
11051107

1106-
self.listener.reset()
1108+
listener.reset()
11071109
cmd = SON([("getnonce", 1)])
1108-
listeners.publish_command_start(cmd, "pymongo_test", 12345, self.client.address, None) # type: ignore[arg-type]
1110+
listeners.publish_command_start(cmd, "pymongo_test", 12345, client.address, None) # type: ignore[arg-type]
11091111
delta = datetime.timedelta(milliseconds=100)
11101112
listeners.publish_command_success(
11111113
delta,
@@ -1116,15 +1118,15 @@ def test_sensitive_commands(self):
11161118
None,
11171119
database_name="pymongo_test",
11181120
)
1119-
started = self.listener.started_events[0]
1120-
succeeded = self.listener.succeeded_events[0]
1121-
self.assertEqual(0, len(self.listener.failed_events))
1121+
started = listener.started_events[0]
1122+
succeeded = listener.succeeded_events[0]
1123+
self.assertEqual(0, len(listener.failed_events))
11221124
self.assertIsInstance(started, monitoring.CommandStartedEvent)
11231125
self.assertEqual({}, started.command)
11241126
self.assertEqual("pymongo_test", started.database_name)
11251127
self.assertEqual("getnonce", started.command_name)
11261128
self.assertIsInstance(started.request_id, int)
1127-
self.assertEqual(self.client.address, started.connection_id)
1129+
self.assertEqual(client.address, started.connection_id)
11281130
self.assertIsInstance(succeeded, monitoring.CommandSucceededEvent)
11291131
self.assertEqual(succeeded.duration_micros, 100000)
11301132
self.assertEqual(started.command_name, succeeded.command_name)

0 commit comments

Comments
 (0)