X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_graph.py;h=bda08de2ec874aecb0c016c7e171fd14bf73e3e9;hb=6a91742b3a25285222551341c8a134b4b2b5aba9;hp=1df1d32f9b76c82b422770245e76a83ad3f0ad48;hpb=d2d857a8c492de2cde82d191a20c50b43842bdd7;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_graph.py b/tests/bindings/python/bt2/test_graph.py index 1df1d32f..bda08de2 100644 --- a/tests/bindings/python/bt2/test_graph.py +++ b/tests/bindings/python/bt2/test_graph.py @@ -31,13 +31,11 @@ class _MyIter(bt2._UserMessageIterator): def _build_meta(self): self._tc = self._component._create_trace_class() self._t = self._tc() - self._sc = self._tc.create_stream_class() + self._sc = self._tc.create_stream_class(supports_packets=True) self._ec = self._sc.create_event_class(name='salut') self._my_int_ft = self._tc.create_signed_integer_field_class(32) payload_ft = self._tc.create_structure_field_class() - payload_ft += collections.OrderedDict([ - ('my_int', self._my_int_ft), - ]) + payload_ft += [('my_int', self._my_int_ft)] self._ec.payload_field_type = payload_ft self._stream = self._t.create_stream(self._sc) self._packet = self._stream.create_packet() @@ -61,7 +59,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_user_cls(self): class MySink(bt2._UserSinkComponent): - def _consume(self): + def _user_consume(self): pass comp = self._graph.add_component(MySink, 'salut') @@ -69,7 +67,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_gen_cls(self): class MySink(bt2._UserSinkComponent): - def _consume(self): + def _user_consume(self): pass comp = self._graph.add_component(MySink, 'salut') @@ -85,7 +83,7 @@ class GraphTestCase(unittest.TestCase): nonlocal comp_params comp_params = params - def _consume(self): + def _user_consume(self): pass params = {'hello': 23, 'path': '/path/to/stuff'} @@ -99,7 +97,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_invalid_logging_level_type(self): class MySink(bt2._UserSinkComponent): - def _consume(self): + def _user_consume(self): pass with self.assertRaises(TypeError): @@ -107,7 +105,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_invalid_logging_level_value(self): class MySink(bt2._UserSinkComponent): - def _consume(self): + def _user_consume(self): pass with self.assertRaises(ValueError): @@ -115,11 +113,12 @@ class GraphTestCase(unittest.TestCase): def test_add_component_logging_level(self): class MySink(bt2._UserSinkComponent): - def _consume(self): + def _user_consume(self): pass - comp = self._graph.add_component(MySink, 'salut', - logging_level=bt2.LoggingLevel.DEBUG) + comp = self._graph.add_component( + MySink, 'salut', logging_level=bt2.LoggingLevel.DEBUG + ) self.assertEqual(comp.logging_level, bt2.LoggingLevel.DEBUG) def test_connect_ports(self): @@ -127,8 +126,7 @@ class GraphTestCase(unittest.TestCase): def __next__(self): raise bt2.Stop - 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') @@ -136,26 +134,26 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') - conn = self._graph.connect_ports(src.output_ports['out'], - sink.input_ports['in']) + conn = self._graph.connect_ports( + src.output_ports['out'], sink.input_ports['in'] + ) self.assertTrue(src.output_ports['out'].is_connected) self.assertTrue(sink.input_ports['in'].is_connected) - self.assertEqual(src.output_ports['out'].connection._ptr, conn._ptr) - self.assertEqual(sink.input_ports['in'].connection._ptr, conn._ptr) + self.assertEqual(src.output_ports['out'].connection.addr, conn.addr) + self.assertEqual(sink.input_ports['in'].connection.addr, conn.addr) def test_connect_ports_invalid_direction(self): class MyIter(bt2._UserMessageIterator): def __next__(self): raise bt2.Stop - 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') @@ -163,23 +161,23 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') with self.assertRaises(TypeError): - conn = self._graph.connect_ports(sink.input_ports['in'], - src.output_ports['out']) + conn = self._graph.connect_ports( + sink.input_ports['in'], src.output_ports['out'] + ) - def test_connect_ports_refused(self): + def test_add_interrupter(self): class MyIter(bt2._UserMessageIterator): def __next__(self): - raise bt2.Stop + raise TypeError - 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') @@ -187,33 +185,44 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): - raise bt2.Stop + def _user_consume(self): + next(self._msg_iter) - def _accept_port_connection(self, port, other_port): - return False + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) + # add two interrupters, set one of them + interrupter1 = bt2.Interrupter() + interrupter2 = bt2.Interrupter() + self._graph.add_interrupter(interrupter1) src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') + self._graph.connect_ports(src.output_ports['out'], sink.input_ports['in']) + self._graph.add_interrupter(interrupter2) + + with self.assertRaises(bt2._Error): + self._graph.run() + + interrupter2.set() + + with self.assertRaises(bt2.TryAgain): + self._graph.run() - with self.assertRaises(bt2.PortConnectionRefused): - conn = self._graph.connect_ports(src.output_ports['out'], - sink.input_ports['in']) + interrupter2.reset() - def test_cancel(self): - self.assertFalse(self._graph.is_canceled) - self._graph.cancel() - self.assertTrue(self._graph.is_canceled) + with self.assertRaises(bt2._Error): + self._graph.run() - # Test that Graph.run() raises bt2.GraphCanceled if the graph gets canceled - # during execution. - def test_cancel_while_running(self): + # Test that Graph.run() raises bt2.Interrupted if the graph gets + # interrupted during execution. + def test_interrupt_while_running(self): class MyIter(_MyIter): def __next__(self): return self._create_stream_beginning_message(self._stream) - 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') @@ -221,22 +230,24 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): - # Pretend that somebody asynchronously cancelled the graph. + def _user_consume(self): + # Pretend that somebody asynchronously interrupted the graph. nonlocal graph - graph.cancel() - + graph.interrupt() return next(self._msg_iter) - def _graph_is_configured(self): - self._msg_iter = self._input_ports['in'].create_message_iterator() + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) - graph = bt2.Graph() - up = graph.add_component(MySource, 'down') - down = graph.add_component(MySink, 'up') - graph.connect_ports(up.output_ports['out'], down.input_ports['in']) - with self.assertRaises(bt2.GraphCanceled): - graph.run() + graph = self._graph + up = self._graph.add_component(MySource, 'down') + down = self._graph.add_component(MySink, 'up') + self._graph.connect_ports(up.output_ports['out'], down.input_ports['in']) + + with self.assertRaises(bt2.TryAgain): + self._graph.run() def test_run(self): class MyIter(_MyIter): @@ -258,8 +269,7 @@ class GraphTestCase(unittest.TestCase): 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') @@ -268,30 +278,33 @@ class GraphTestCase(unittest.TestCase): self._input_port = self._add_input_port('in') self._at = 0 - def _consume(comp_self): + def _user_consume(comp_self): msg = next(comp_self._msg_iter) if comp_self._at == 0: - self.assertIsInstance(msg, bt2.message._StreamBeginningMessage) + self.assertIsInstance(msg, bt2._StreamBeginningMessage) elif comp_self._at == 1: - self.assertIsInstance(msg, bt2.message._PacketBeginningMessage) + self.assertIsInstance(msg, bt2._PacketBeginningMessage) elif comp_self._at >= 2 and comp_self._at <= 6: - self.assertIsInstance(msg, bt2.message._EventMessage) + self.assertIsInstance(msg, bt2._EventMessage) self.assertEqual(msg.event.cls.name, 'salut') elif comp_self._at == 7: - self.assertIsInstance(msg, bt2.message._PacketEndMessage) + self.assertIsInstance(msg, bt2._PacketEndMessage) elif comp_self._at == 8: - self.assertIsInstance(msg, bt2.message._StreamEndMessage) + self.assertIsInstance(msg, bt2._StreamEndMessage) comp_self._at += 1 - def _graph_is_configured(self): - self._msg_iter = self._input_port.create_message_iterator() + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_port + ) src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') - conn = self._graph.connect_ports(src.output_ports['out'], - sink.input_ports['in']) + conn = self._graph.connect_ports( + src.output_ports['out'], sink.input_ports['in'] + ) self._graph.run() def test_run_again(self): @@ -310,8 +323,7 @@ class GraphTestCase(unittest.TestCase): 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') @@ -320,27 +332,30 @@ class GraphTestCase(unittest.TestCase): self._input_port = self._add_input_port('in') self._at = 0 - def _consume(comp_self): + def _user_consume(comp_self): msg = next(comp_self._msg_iter) if comp_self._at == 0: - self.assertIsInstance(msg, bt2.message._StreamBeginningMessage) + self.assertIsInstance(msg, bt2._StreamBeginningMessage) elif comp_self._at == 1: - self.assertIsInstance(msg, bt2.message._PacketBeginningMessage) + self.assertIsInstance(msg, bt2._PacketBeginningMessage) elif comp_self._at == 2: - self.assertIsInstance(msg, bt2.message._EventMessage) + self.assertIsInstance(msg, bt2._EventMessage) raise bt2.TryAgain else: pass comp_self._at += 1 - def _graph_is_configured(self): - self._msg_iter = self._input_port.create_message_iterator() + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_port + ) src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') - conn = self._graph.connect_ports(src.output_ports['out'], - sink.input_ports['in']) + conn = self._graph.connect_ports( + src.output_ports['out'], sink.input_ports['in'] + ) with self.assertRaises(bt2.TryAgain): self._graph.run() @@ -366,8 +381,7 @@ class GraphTestCase(unittest.TestCase): 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') @@ -376,14 +390,14 @@ class GraphTestCase(unittest.TestCase): self._input_port = self._add_input_port('in') self._at = 0 - def _consume(comp_self): + def _user_consume(comp_self): msg = next(comp_self._msg_iter) if comp_self._at == 0: - self.assertIsInstance(msg, bt2.message._StreamBeginningMessage) + self.assertIsInstance(msg, bt2._StreamBeginningMessage) elif comp_self._at == 1: - self.assertIsInstance(msg, bt2.message._PacketBeginningMessage) + self.assertIsInstance(msg, bt2._PacketBeginningMessage) elif comp_self._at == 2: - self.assertIsInstance(msg, bt2.message._EventMessage) + self.assertIsInstance(msg, bt2._EventMessage) elif comp_self._at == 3: nonlocal raised_in_sink raised_in_sink = True @@ -391,15 +405,18 @@ class GraphTestCase(unittest.TestCase): comp_self._at += 1 - def _graph_is_configured(self): - self._msg_iter = self._input_port.create_message_iterator() + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_port + ) src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') - conn = self._graph.connect_ports(src.output_ports['out'], - sink.input_ports['in']) + conn = self._graph.connect_ports( + src.output_ports['out'], sink.input_ports['in'] + ) - with self.assertRaises(bt2.Error): + with self.assertRaises(bt2._Error): self._graph.run() def test_listeners(self): @@ -407,8 +424,7 @@ class GraphTestCase(unittest.TestCase): def __next__(self): raise bt2.Stop - 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._add_output_port('zero') @@ -417,30 +433,36 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop - def _port_connected(self, port, other_port): + def _user_port_connected(self, port, other_port): self._add_input_port('taste') def port_added_listener(component, port): nonlocal calls calls.append((port_added_listener, component, port)) - def ports_connected_listener(upstream_component, upstream_port, - downstream_component, downstream_port): + def ports_connected_listener( + upstream_component, upstream_port, downstream_component, downstream_port + ): nonlocal calls - calls.append((ports_connected_listener, - upstream_component, upstream_port, - downstream_component, downstream_port)) + calls.append( + ( + ports_connected_listener, + upstream_component, + upstream_port, + downstream_component, + downstream_port, + ) + ) calls = [] self._graph.add_port_added_listener(port_added_listener) self._graph.add_ports_connected_listener(ports_connected_listener) src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') - self._graph.connect_ports(src.output_ports['out'], - sink.input_ports['in']) + self._graph.connect_ports(src.output_ports['out'], sink.input_ports['in']) self.assertEqual(len(calls), 5) @@ -471,8 +493,7 @@ class GraphTestCase(unittest.TestCase): def __next__(self): raise bt2.Stop - 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._add_output_port('zero') @@ -481,10 +502,10 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop - def _port_connected(self, port, other_port): + def _user_port_connected(self, port, other_port): self._add_input_port('taste') with self.assertRaises(TypeError): @@ -497,12 +518,12 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): raise ValueError('oops!') - def _consume(self): + def _user_consume(self): raise bt2.Stop graph = bt2.Graph() - with self.assertRaises(bt2.Error): + with self.assertRaises(bt2._Error): graph.add_component(MySink, 'comp') def test_raise_in_port_added_listener(self): @@ -510,7 +531,7 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop def port_added_listener(component, port): @@ -519,7 +540,7 @@ class GraphTestCase(unittest.TestCase): graph = bt2.Graph() graph.add_port_added_listener(port_added_listener) - with self.assertRaises(bt2.Error): + with self.assertRaises(bt2._Error): graph.add_component(MySink, 'comp') def test_raise_in_ports_connected_listener(self): @@ -527,8 +548,7 @@ class GraphTestCase(unittest.TestCase): def __next__(self): raise bt2.Stop - 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') @@ -536,11 +556,12 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop - def ports_connected_listener(upstream_component, upstream_port, - downstream_component, downstream_port): + def ports_connected_listener( + upstream_component, upstream_port, downstream_component, downstream_port + ): raise ValueError('oh noes!') graph = bt2.Graph() @@ -548,5 +569,5 @@ class GraphTestCase(unittest.TestCase): up = graph.add_component(MySource, 'down') down = graph.add_component(MySink, 'up') - with self.assertRaises(bt2.Error): + with self.assertRaises(bt2._Error): graph.connect_ports(up.output_ports['out'], down.input_ports['in'])