Fix: _EventConst.__getitem__(): check if event has a packet

I'm also adding a test to check this. Without this patch and an invalid
key, __getitem__() throws `AttributeError` instead of the expected
`KeyError`.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ie6258a2354ece8aee6c8530587c900ea08e45fe8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3350
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/bindings/python/bt2/bt2/event.py b/src/bindings/python/bt2/bt2/event.py
index 08d6ae0949b108ccb9be366740ebb98fa4d6cb94..6a6c1185987517c8c930e32b0b545e19b0daf5a8 100644 (file)
--- a/src/bindings/python/bt2/bt2/event.py
+++ b/src/bindings/python/bt2/bt2/event.py
@@ -123,10 +123,11 @@ class _EventConst(object._UniqueObject):
         if common_context_field is not None and key in common_context_field:
             return common_context_field[key]
 
-        packet_context_field = self.packet.context_field
+        if self.packet:
+            packet_context_field = self.packet.context_field
 
-        if packet_context_field is not None and key in packet_context_field:
-            return packet_context_field[key]
+            if packet_context_field is not None and key in packet_context_field:
+                return packet_context_field[key]
 
         raise KeyError(key)
 

diff --git a/tests/bindings/python/bt2/test_event.py b/tests/bindings/python/bt2/test_event.py
index a770c8f5d58c4316b6f5de9346e509783415b7c6..e8effef34535ea1cb55953db817a0a2803a1d56b 100644 (file)
--- a/tests/bindings/python/bt2/test_event.py
+++ b/tests/bindings/python/bt2/test_event.py
@@ -331,6 +331,20 @@ class EventTestCase(unittest.TestCase):
         with self.assertRaises(KeyError):
             ev['yes']
 
+    def test_const_getitem_no_packet(self):
+        def event_fields_config(event):
+            event.payload_field['giraffe'] = 1
+            event.payload_field['gnu'] = 23
+            event.payload_field['mosquito'] = 42
+
+        msg = self._create_test_const_event_message(
+            event_fields_config=event_fields_config, with_ep=True,
+        )
+        ev = msg.event
+
+        with self.assertRaises(KeyError):
+            ev['yes']
+
     def test_getitem(self):
         msg = utils.get_event_message()
         ev = msg.event