X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_graph.py;h=bda08de2ec874aecb0c016c7e171fd14bf73e3e9;hb=6a91742b3a25285222551341c8a134b4b2b5aba9;hp=f6f5dcaae9eab4a5bc70d06e8f1fcb873d19a1f2;hpb=694c792bc8f078c02acde68a3390acafbb36b2f4;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_graph.py b/tests/bindings/python/bt2/test_graph.py index f6f5dcaa..bda08de2 100644 --- a/tests/bindings/python/bt2/test_graph.py +++ b/tests/bindings/python/bt2/test_graph.py @@ -59,10 +59,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_user_cls(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass comp = self._graph.add_component(MySink, 'salut') @@ -70,10 +67,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_gen_cls(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass comp = self._graph.add_component(MySink, 'salut') @@ -89,10 +83,7 @@ class GraphTestCase(unittest.TestCase): nonlocal comp_params comp_params = params - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass params = {'hello': 23, 'path': '/path/to/stuff'} @@ -106,10 +97,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_invalid_logging_level_type(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass with self.assertRaises(TypeError): @@ -117,10 +105,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_invalid_logging_level_value(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass with self.assertRaises(ValueError): @@ -128,10 +113,7 @@ class GraphTestCase(unittest.TestCase): def test_add_component_logging_level(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass comp = self._graph.add_component( @@ -152,12 +134,9 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop - def _graph_is_configured(self): - pass - src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') @@ -182,12 +161,9 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop - def _graph_is_configured(self): - pass - src = self._graph.add_component(MySource, 'src') sink = self._graph.add_component(MySink, 'sink') @@ -196,14 +172,52 @@ class GraphTestCase(unittest.TestCase): sink.input_ports['in'], src.output_ports['out'] ) - def test_cancel(self): - self.assertFalse(self._graph.is_canceled) - self._graph.cancel() - self.assertTrue(self._graph.is_canceled) + def test_add_interrupter(self): + class MyIter(bt2._UserMessageIterator): + def __next__(self): + raise TypeError + + class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): + def __init__(self, params): + self._add_output_port('out') + + class MySink(bt2._UserSinkComponent): + def __init__(self, params): + self._add_input_port('in') + + def _user_consume(self): + next(self._msg_iter) + + 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) - # Test that Graph.run() raises bt2.Canceled if the graph gets canceled - # during execution. - def test_cancel_while_running(self): + with self.assertRaises(bt2._Error): + self._graph.run() + + interrupter2.set() + + with self.assertRaises(bt2.TryAgain): + self._graph.run() + + interrupter2.reset() + + with self.assertRaises(bt2._Error): + self._graph.run() + + # 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) @@ -216,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.Canceled): - 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): @@ -262,25 +278,27 @@ 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') @@ -314,22 +332,24 @@ 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') @@ -370,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 @@ -385,8 +405,10 @@ 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') @@ -411,13 +433,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 _graph_is_configured(self): - pass - - 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): @@ -483,13 +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 _graph_is_configured(self): - pass - - def _port_connected(self, port, other_port): + def _user_port_connected(self, port, other_port): self._add_input_port('taste') with self.assertRaises(TypeError): @@ -502,12 +518,9 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): raise ValueError('oops!') - def _consume(self): + def _user_consume(self): raise bt2.Stop - def _graph_is_configured(self): - pass - graph = bt2.Graph() with self.assertRaises(bt2._Error): @@ -518,12 +531,9 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop - def _graph_is_configured(self): - pass - def port_added_listener(component, port): raise ValueError('oh noes!') @@ -546,12 +556,9 @@ class GraphTestCase(unittest.TestCase): def __init__(self, params): self._add_input_port('in') - def _consume(self): + def _user_consume(self): raise bt2.Stop - def _graph_is_configured(self): - pass - def ports_connected_listener( upstream_component, upstream_port, downstream_component, downstream_port ):