PYTHON-3014 Update how events are added to entity map to match specification (#785)

Author: juliusgeo

test/test_create_entities.py

@@ -47,11 +47,12 @@ def test_store_events_as_entities(self):
         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 @@ def test_store_all_others_as_entities(self):
         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)

test/unified_format.py

@@ -226,7 +226,11 @@ def add_event(self, event):
         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: