Apply black code formatter on all Python code

[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..869c072c6f508028d33e71a94ba47685305c56cf 100644 (file)
--- a/tests/bindings/python/bt2/test_message_iterator.py
+++ b/tests/bindings/python/bt2/test_message_iterator.py
@@ -1,4 +1,3 @@
-
 #
 # Copyright (C) 2019 EfficiOS Inc.
 #
@@ -40,8 +39,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
         graph = bt2.Graph()
         src_comp = graph.add_component(src_comp_cls, 'src')
         sink_comp = graph.add_component(MySink, 'sink')
-        graph.connect_ports(src_comp.output_ports['out'],
-                            sink_comp.input_ports['in'])
+        graph.connect_ports(src_comp.output_ports['out'], sink_comp.input_ports['in'])
         return graph
 
     def test_init(self):
@@ -55,8 +53,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
                 initialized = True
                 the_output_port_from_iter = self_port_output
 
-        class MySource(bt2._UserSourceComponent,
-                       message_iterator_class=MyIter):
+        class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter):
             def __init__(self, params):
                 nonlocal the_output_port_from_source
                 the_output_port_from_source = self._add_output_port('out', 'user data')
@@ -65,7 +62,9 @@ class UserMessageIteratorTestCase(unittest.TestCase):
         graph = self._create_graph(MySource)
         graph.run()
         self.assertTrue(initialized)
-        self.assertEqual(the_output_port_from_source.addr, the_output_port_from_iter.addr)
+        self.assertEqual(
+            the_output_port_from_source.addr, the_output_port_from_iter.addr
+        )
         self.assertEqual(the_output_port_from_iter.user_data, 'user data')
 
     def test_finalize(self):
@@ -74,8 +73,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
                 nonlocal finalized
                 finalized = True
 
-        class MySource(bt2._UserSourceComponent,
-                       message_iterator_class=MyIter):
+        class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter):
             def __init__(self, params):
                 self._add_output_port('out')
 
@@ -91,8 +89,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
                 nonlocal salut
                 salut = self._component._salut
 
-        class MySource(bt2._UserSourceComponent,
-                       message_iterator_class=MyIter):
+        class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter):
             def __init__(self, params):
                 self._add_output_port('out')
                 self._salut = 23
@@ -108,8 +105,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
                 nonlocal addr
                 addr = self.addr
 
-        class MySource(bt2._UserSourceComponent,
-                       message_iterator_class=MyIter):
+        class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter):
             def __init__(self, params):
                 self._add_output_port('out')
 
@@ -134,7 +130,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 +141,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 +150,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 +178,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
@@ -203,11 +197,10 @@ class UserMessageIteratorTestCase(unittest.TestCase):
                 else:
                     raise StopIteration
 
-        class MySource(bt2._UserSourceComponent,
-                       message_iterator_class=MySourceIter):
+        class MySource(bt2._UserSourceComponent, 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))
@@ -232,7 +225,6 @@ class UserMessageIteratorTestCase(unittest.TestCase):
                 input_port = self._add_input_port('in')
                 self._add_output_port('out', input_port)
 
-
         graph = bt2.Graph()
         src = graph.add_component(MySource, 'src')
         flt = graph.add_component(MyFilter, 'flt')
@@ -274,7 +266,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()
 
@@ -301,7 +293,7 @@ class UserMessageIteratorTestCase(unittest.TestCase):
         it, MySourceIter = self._setup_seek_beginning_test()
 
         def _seek_beginning_error(self):
-           raise ValueError('ouch')
+            raise ValueError('ouch')
 
         MySourceIter._seek_beginning = _seek_beginning_error
 
@@ -309,7 +301,6 @@ class UserMessageIteratorTestCase(unittest.TestCase):
             it.seek_beginning()
 
 
-
 class OutputPortMessageIteratorTestCase(unittest.TestCase):
     def test_component(self):
         class MyIter(bt2._UserMessageIterator):
@@ -329,28 +320,29 @@ class OutputPortMessageIteratorTestCase(unittest.TestCase):
                 elif self._at == 6:
                     msg = self._create_stream_end_message(test_obj._stream)
                 else:
-                    msg = self._create_event_message(test_obj._event_class, test_obj._packet)
+                    msg = self._create_event_message(
+                        test_obj._event_class, test_obj._packet
+                    )
                     msg.event.payload_field['my_int'] = self._at * 3
 
                 self._at += 1
                 return msg
 
-        class MySource(bt2._UserSourceComponent,
-                       message_iterator_class=MyIter):
+        class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter):
             def __init__(self, params):
                 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)
                 payload_ft = trace_class.create_structure_field_class()
-                payload_ft += collections.OrderedDict([
-                    ('my_int', my_int_ft),
-                ])
+                payload_ft += [('my_int', my_int_ft)]
 
-                event_class = stream_class.create_event_class(name='salut', payload_field_class=payload_ft)
+                event_class = stream_class.create_event_class(
+                    name='salut', payload_field_class=payload_ft
+                )
 
                 trace = trace_class()
                 stream = trace.create_stream(stream_class)
@@ -380,5 +372,6 @@ class OutputPortMessageIteratorTestCase(unittest.TestCase):
                 field = msg.event.payload_field['my_int']
                 self.assertEqual(field, at * 3)
 
+
 if __name__ == '__main__':
     unittest.main()