lib: make packets and packet messages optional, disabled by default

[babeltrace.git] / tests / bindings / python / bt2 / test_message_iterator.py

diff --git a/tests/bindings/python/bt2/test_message_iterator.py b/tests/bindings/python/bt2/test_message_iterator.py
index a9762976bcef8f9adc2a3b354c13dc3ce7b1a80a..bd0a52eefc9860d3cbd9fbbf2d335a0006c4b953 100644 (file)
--- a/tests/bindings/python/bt2/test_message_iterator.py
+++ b/tests/bindings/python/bt2/test_message_iterator.py
@@ -134,7 +134,6 @@ class UserMessageIteratorTestCase(unittest.TestCase):
 
                 self._msgs = [
                     self._create_stream_beginning_message(stream),
-                    self._create_stream_activity_beginning_message(stream),
                     self._create_packet_beginning_message(packet),
                     event_message,
                     event_message,
@@ -146,7 +145,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
         class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter):
             def __init__(self, params):
                 tc = self._create_trace_class()
-                sc = tc.create_stream_class()
+                sc = tc.create_stream_class(supports_packets=True)
                 ec = sc.create_event_class()
                 self._add_output_port('out', (tc, sc, ec))
 
@@ -155,9 +154,10 @@ class UserMessageIteratorTestCase(unittest.TestCase):
         it = graph.create_output_port_message_iterator(src.output_ports['out'])
 
         # Skip beginning messages.
-        next(it)
-        next(it)
-        next(it)
+        msg = next(it)
+        self.assertIsInstance(msg, bt2.message._StreamBeginningMessage)
+        msg = next(it)
+        self.assertIsInstance(msg, bt2.message._PacketBeginningMessage)
 
         msg_ev1 = next(it)
         msg_ev2 = next(it)
@@ -182,12 +182,10 @@ class UserMessageIteratorTestCase(unittest.TestCase):
 
                 self._msgs = [
                     self._create_stream_beginning_message(stream),
-                    self._create_stream_activity_beginning_message(stream),
                     self._create_packet_beginning_message(packet),
                     self._create_event_message(ec, packet),
                     self._create_event_message(ec, packet),
                     self._create_packet_end_message(packet),
-                    self._create_stream_activity_end_message(stream),
                     self._create_stream_end_message(stream),
                 ]
                 self._at = 0
@@ -207,7 +205,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
                        message_iterator_class=MySourceIter):
             def __init__(self, params):
                 tc = self._create_trace_class()
-                sc = tc.create_stream_class()
+                sc = tc.create_stream_class(supports_packets=True)
                 ec = sc.create_event_class()
 
                 self._add_output_port('out', (tc, sc, ec))
@@ -274,7 +272,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
         msg = next(it)
         self.assertIsInstance(msg, bt2.message._StreamBeginningMessage)
         msg = next(it)
-        self.assertIsInstance(msg, bt2.message._StreamActivityBeginningMessage)
+        self.assertIsInstance(msg, bt2.message._PacketBeginningMessage)
 
         it.seek_beginning()
 
@@ -341,7 +339,7 @@ class OutputPortMessageIteratorTestCase(unittest.TestCase):
                 self._add_output_port('out')
 
                 trace_class = self._create_trace_class()
-                stream_class = trace_class.create_stream_class()
+                stream_class = trace_class.create_stream_class(supports_packets=True)
 
                 # Create payload field class
                 my_int_ft = trace_class.create_signed_integer_field_class(32)