From 6d1dd6d63a43823204a33776a3da6c77f42068e2 Mon Sep 17 00:00:00 2001 From: Julius Park Date: Fri, 12 Nov 2021 16:23:57 -0800 Subject: [PATCH] PYTHON-3014 Update how events are added to entity map to match specification (#785) --- test/test_create_entities.py | 4 +++- test/unified_format.py | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/test_create_entities.py b/test/test_create_entities.py index 3f60eb9b7..b82b730ae 100644 --- a/test/test_create_entities.py +++ b/test/test_create_entities.py @@ -47,11 +47,12 @@ class TestCreateEntities(unittest.TestCase): self.scenario_runner.TEST_SPEC = spec self.scenario_runner.setUp() self.scenario_runner.run_scenario(spec["tests"][0]) + self.scenario_runner.entity_map["client0"].close() final_entity_map = self.scenario_runner.entity_map self.assertIn("events1", final_entity_map) self.assertGreater(len(final_entity_map["events1"]), 0) for event in final_entity_map["events1"]: - self.assertIn("PoolCreatedEvent", event) + self.assertIn("PoolCreatedEvent", event["name"]) def test_store_all_others_as_entities(self): self.scenario_runner = UnifiedSpecTestMixinV1() @@ -130,6 +131,7 @@ class TestCreateEntities(unittest.TestCase): self.scenario_runner.TEST_SPEC = spec self.scenario_runner.setUp() self.scenario_runner.run_scenario(spec["tests"][0]) + self.scenario_runner.entity_map["client0"].close() final_entity_map = self.scenario_runner.entity_map for entity in ["errors", "failures"]: self.assertIn(entity, final_entity_map) diff --git a/test/unified_format.py b/test/unified_format.py index 0d60a0546..25a980425 100644 --- a/test/unified_format.py +++ b/test/unified_format.py @@ -226,7 +226,11 @@ class EventListenerUtil(CMAPListener, CommandListener): if event_name in self._event_types: super(EventListenerUtil, self).add_event(event) for id in self._event_mapping[event_name]: - self.entity_map[id].append(str(event)) + self.entity_map[id].append({ + "name": type(event).__name__, + "observedAt": time.time(), + "description": repr(event) + }) def _command_event(self, event): if event.command_name.lower() not in self._ignore_commands: