X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_message_iterator.py;h=01d4eca3c5b9d0d4d768dd6304554b6b2b01512d;hb=f2fb1b3297ca0bc13b53189a063b63944be7fae9;hp=c8d2cf16806d22566149995ee8c97c9c15906f34;hpb=3fb99a226ccb40c79de6b55b5a249d93b9c5262e;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_message_iterator.py b/tests/bindings/python/bt2/test_message_iterator.py index c8d2cf16..01d4eca3 100644 --- a/tests/bindings/python/bt2/test_message_iterator.py +++ b/tests/bindings/python/bt2/test_message_iterator.py @@ -16,48 +16,46 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -from bt2 import value -import collections import unittest -import copy import bt2 +import sys +from utils import TestOutputPortMessageIterator +from bt2 import port as bt2_port -class UserMessageIteratorTestCase(unittest.TestCase): - @staticmethod - def _create_graph(src_comp_cls, flt_comp_cls=None): - class MySink(bt2._UserSinkComponent): - def __init__(self, params): - self._add_input_port('in') +class SimpleSink(bt2._UserSinkComponent): + # Straightforward sink that creates one input port (`in`) and consumes from + # it. - def _consume(self): - next(self._msg_iter) + def __init__(self, params, obj): + self._add_input_port('in') - def _graph_is_configured(self): - self._msg_iter = self._create_input_port_message_iterator( - self._input_ports['in'] - ) + def _user_consume(self): + next(self._msg_iter) - graph = bt2.Graph() - src_comp = graph.add_component(src_comp_cls, 'src') + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) - if flt_comp_cls is not None: - flt_comp = graph.add_component(flt_comp_cls, 'flt') - sink_comp = graph.add_component(MySink, 'sink') +def _create_graph(src_comp_cls, sink_comp_cls, flt_comp_cls=None): + graph = bt2.Graph() - if flt_comp_cls is not None: - assert flt_comp is not None - graph.connect_ports( - src_comp.output_ports['out'], flt_comp.input_ports['in'] - ) - out_port = flt_comp.output_ports['out'] - else: - out_port = src_comp.output_ports['out'] + src_comp = graph.add_component(src_comp_cls, 'src') + sink_comp = graph.add_component(sink_comp_cls, 'sink') - graph.connect_ports(out_port, sink_comp.input_ports['in']) - return graph + if flt_comp_cls is not None: + flt_comp = graph.add_component(flt_comp_cls, 'flt') + graph.connect_ports(src_comp.output_ports['out'], flt_comp.input_ports['in']) + graph.connect_ports(flt_comp.output_ports['out'], sink_comp.input_ports['in']) + else: + graph.connect_ports(src_comp.output_ports['out'], sink_comp.input_ports['in']) + return graph + + +class UserMessageIteratorTestCase(unittest.TestCase): def test_init(self): the_output_port_from_source = None the_output_port_from_iter = None @@ -70,12 +68,12 @@ class UserMessageIteratorTestCase(unittest.TestCase): the_output_port_from_iter = self_port_output class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): - def __init__(self, params): + def __init__(self, params, obj): nonlocal the_output_port_from_source the_output_port_from_source = self._add_output_port('out', 'user data') initialized = False - graph = self._create_graph(MySource) + graph = _create_graph(MySource, SimpleSink) graph.run() self.assertTrue(initialized) self.assertEqual( @@ -90,7 +88,7 @@ class UserMessageIteratorTestCase(unittest.TestCase): src_iter_initialized = True class MySource(bt2._UserSourceComponent, message_iterator_class=MySourceIter): - def __init__(self, params): + def __init__(self, params, obj): self._add_output_port('out') class MyFilterIter(bt2._UserMessageIterator): @@ -105,29 +103,68 @@ class UserMessageIteratorTestCase(unittest.TestCase): return next(self._up_iter) class MyFilter(bt2._UserFilterComponent, message_iterator_class=MyFilterIter): - def __init__(self, params): + def __init__(self, params, obj): self._add_input_port('in') self._add_output_port('out') src_iter_initialized = False flt_iter_initialized = False - graph = self._create_graph(MySource, MyFilter) + graph = _create_graph(MySource, SimpleSink, MyFilter) graph.run() self.assertTrue(src_iter_initialized) self.assertTrue(flt_iter_initialized) + def test_create_user_error(self): + # This tests both error handling by + # _UserSinkComponent._create_input_port_message_iterator + # and _UserMessageIterator._create_input_port_message_iterator, as they + # are both used in the graph. + class MySourceIter(bt2._UserMessageIterator): + def __init__(self, self_port_output): + raise ValueError('Very bad error') + + class MySource(bt2._UserSourceComponent, message_iterator_class=MySourceIter): + def __init__(self, params, obj): + self._add_output_port('out') + + class MyFilterIter(bt2._UserMessageIterator): + def __init__(self, self_port_output): + # This is expected to raise because of the error in + # MySourceIter.__init__. + self._create_input_port_message_iterator( + self._component._input_ports['in'] + ) + + class MyFilter(bt2._UserFilterComponent, message_iterator_class=MyFilterIter): + def __init__(self, params, obj): + self._add_input_port('in') + self._add_output_port('out') + + graph = _create_graph(MySource, SimpleSink, MyFilter) + + with self.assertRaises(bt2._Error) as ctx: + graph.run() + + exc = ctx.exception + cause = exc[0] + + self.assertIsInstance(cause, bt2._MessageIteratorErrorCause) + self.assertEqual(cause.component_name, 'src') + self.assertEqual(cause.component_output_port_name, 'out') + self.assertIn('ValueError: Very bad error', cause.message) + def test_finalize(self): class MyIter(bt2._UserMessageIterator): - def _finalize(self): + def _user_finalize(self): nonlocal finalized finalized = True class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): - def __init__(self, params): + def __init__(self, params, obj): self._add_output_port('out') finalized = False - graph = self._create_graph(MySource) + graph = _create_graph(MySource, SimpleSink) graph.run() del graph self.assertTrue(finalized) @@ -139,15 +176,34 @@ class UserMessageIteratorTestCase(unittest.TestCase): salut = self._component._salut class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): - def __init__(self, params): + def __init__(self, params, obj): self._add_output_port('out') self._salut = 23 salut = None - graph = self._create_graph(MySource) + graph = _create_graph(MySource, SimpleSink) graph.run() self.assertEqual(salut, 23) + def test_port(self): + class MyIter(bt2._UserMessageIterator): + def __init__(self_iter, self_port_output): + nonlocal called + called = True + port = self_iter._port + self.assertIs(type(self_port_output), bt2_port._UserComponentOutputPort) + self.assertIs(type(port), bt2_port._UserComponentOutputPort) + self.assertEqual(self_port_output.addr, port.addr) + + class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): + def __init__(self, params, obj): + self._add_output_port('out') + + called = False + graph = _create_graph(MySource, SimpleSink) + graph.run() + self.assertTrue(called) + def test_addr(self): class MyIter(bt2._UserMessageIterator): def __init__(self, self_port_output): @@ -155,11 +211,11 @@ class UserMessageIteratorTestCase(unittest.TestCase): addr = self.addr class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): - def __init__(self, params): + def __init__(self, params, obj): self._add_output_port('out') addr = None - graph = self._create_graph(MySource) + graph = _create_graph(MySource, SimpleSink) graph.run() self.assertIsNotNone(addr) self.assertNotEqual(addr, 0) @@ -188,7 +244,7 @@ class UserMessageIteratorTestCase(unittest.TestCase): return self._msgs.pop(0) class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): - def __init__(self, params): + def __init__(self, params, obj): tc = self._create_trace_class() sc = tc.create_stream_class(supports_packets=True) ec = sc.create_event_class() @@ -196,63 +252,32 @@ class UserMessageIteratorTestCase(unittest.TestCase): graph = bt2.Graph() src = graph.add_component(MySource, 'src') - it = graph.create_output_port_message_iterator(src.output_ports['out']) + it = TestOutputPortMessageIterator(graph, src.output_ports['out']) # Skip beginning messages. msg = next(it) - self.assertIsInstance(msg, bt2._StreamBeginningMessage) + self.assertIs(type(msg), bt2._StreamBeginningMessageConst) msg = next(it) - self.assertIsInstance(msg, bt2._PacketBeginningMessage) + self.assertIs(type(msg), bt2._PacketBeginningMessageConst) msg_ev1 = next(it) msg_ev2 = next(it) - self.assertIsInstance(msg_ev1, bt2._EventMessage) - self.assertIsInstance(msg_ev2, bt2._EventMessage) + self.assertIs(type(msg_ev1), bt2._EventMessageConst) + self.assertIs(type(msg_ev2), bt2._EventMessageConst) self.assertEqual(msg_ev1.addr, msg_ev2.addr) - @staticmethod - def _setup_seek_beginning_test(): - # Use a source, a filter and an output port iterator. This allows us - # to test calling `seek_beginning` on both a _OutputPortMessageIterator - # and a _UserComponentInputPortMessageIterator, on top of checking that - # _UserMessageIterator._seek_beginning is properly called. - - class MySourceIter(bt2._UserMessageIterator): - def __init__(self, port): - tc, sc, ec = port.user_data - trace = tc() - stream = trace.create_stream(sc) - packet = stream.create_packet() - - self._msgs = [ - self._create_stream_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_end_message(stream), - ] - self._at = 0 - - def _seek_beginning(self): - self._at = 0 - + # Try consuming many times from an iterator that always returns TryAgain. + # This verifies that we are not missing an incref of Py_None, making the + # refcount of Py_None reach 0. + def test_try_again_many_times(self): + class MyIter(bt2._UserMessageIterator): def __next__(self): - if self._at < len(self._msgs): - msg = self._msgs[self._at] - self._at += 1 - return msg - else: - raise StopIteration - - class MySource(bt2._UserSourceComponent, message_iterator_class=MySourceIter): - def __init__(self, params): - tc = self._create_trace_class() - sc = tc.create_stream_class(supports_packets=True) - ec = sc.create_event_class() + raise bt2.TryAgain - self._add_output_port('out', (tc, sc, ec)) + class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): + def __init__(self, params, obj): + self._add_output_port('out') class MyFilterIter(bt2._UserMessageIterator): def __init__(self, port): @@ -264,187 +289,292 @@ class UserMessageIteratorTestCase(unittest.TestCase): def __next__(self): return next(self._upstream_iter) - def _seek_beginning(self): + def _user_seek_beginning(self): self._upstream_iter.seek_beginning() @property - def _can_seek_beginning(self): + def _user_can_seek_beginning(self): return self._upstream_iter.can_seek_beginning class MyFilter(bt2._UserFilterComponent, message_iterator_class=MyFilterIter): - def __init__(self, params): + def __init__(self, params, obj): 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') - graph.connect_ports(src.output_ports['out'], flt.input_ports['in']) - it = graph.create_output_port_message_iterator(flt.output_ports['out']) + it = TestOutputPortMessageIterator(graph, src.output_ports['out']) + + # Three times the initial ref count of `None` iterations should + # be enough to catch the bug even if there are small differences + # between configurations. + none_ref_count = sys.getrefcount(None) * 3 + + for i in range(none_ref_count): + with self.assertRaises(bt2.TryAgain): + next(it) + + +def _setup_seek_test(sink_cls, user_seek_beginning=None, user_can_seek_beginning=None): + class MySourceIter(bt2._UserMessageIterator): + def __init__(self, port): + tc, sc, ec = port.user_data + trace = tc() + stream = trace.create_stream(sc) + packet = stream.create_packet() + + self._msgs = [ + self._create_stream_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_end_message(stream), + ] + self._at = 0 + + def __next__(self): + if self._at < len(self._msgs): + msg = self._msgs[self._at] + self._at += 1 + return msg + else: + raise StopIteration + + if user_seek_beginning is not None: + MySourceIter._user_seek_beginning = user_seek_beginning + + if user_can_seek_beginning is not None: + MySourceIter._user_can_seek_beginning = property(user_can_seek_beginning) - return it, MySourceIter + class MySource(bt2._UserSourceComponent, message_iterator_class=MySourceIter): + def __init__(self, params, obj): + tc = self._create_trace_class() + sc = tc.create_stream_class(supports_packets=True) + ec = sc.create_event_class() + self._add_output_port('out', (tc, sc, ec)) + + class MyFilterIter(bt2._UserMessageIterator): + def __init__(self, port): + self._upstream_iter = self._create_input_port_message_iterator( + self._component._input_ports['in'] + ) + + def __next__(self): + return next(self._upstream_iter) + + @property + def _user_can_seek_beginning(self): + return self._upstream_iter.can_seek_beginning + + def _user_seek_beginning(self): + self._upstream_iter.seek_beginning() + + class MyFilter(bt2._UserFilterComponent, message_iterator_class=MyFilterIter): + def __init__(self, params, obj): + self._add_input_port('in') + self._add_output_port('out') + + return _create_graph(MySource, sink_cls, flt_comp_cls=MyFilter) + + +class UserMessageIteratorSeekBeginningTestCase(unittest.TestCase): def test_can_seek_beginning(self): - it, MySourceIter = self._setup_seek_beginning_test() + class MySink(bt2._UserSinkComponent): + def __init__(self, params, obj): + self._add_input_port('in') - def _can_seek_beginning(self): - nonlocal can_seek_beginning - return can_seek_beginning + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) - MySourceIter._can_seek_beginning = property(_can_seek_beginning) + def _user_consume(self): + nonlocal can_seek_beginning + can_seek_beginning = self._msg_iter.can_seek_beginning - can_seek_beginning = True - self.assertTrue(it.can_seek_beginning) + def _user_can_seek_beginning(self): + nonlocal input_port_iter_can_seek_beginning + return input_port_iter_can_seek_beginning - can_seek_beginning = False - self.assertFalse(it.can_seek_beginning) + graph = _setup_seek_test( + MySink, user_can_seek_beginning=_user_can_seek_beginning + ) - # Once can_seek_beginning returns an error, verify that it raises when - # _can_seek_beginning has/returns the wrong type. + input_port_iter_can_seek_beginning = True + can_seek_beginning = None + graph.run_once() + self.assertTrue(can_seek_beginning) - # Remove the _can_seek_beginning method, we now rely on the presence of - # a _seek_beginning method to know whether the iterator can seek to - # beginning or not. - del MySourceIter._can_seek_beginning - self.assertTrue(it.can_seek_beginning) + input_port_iter_can_seek_beginning = False + can_seek_beginning = None + graph.run_once() + self.assertFalse(can_seek_beginning) - del MySourceIter._seek_beginning - self.assertFalse(it.can_seek_beginning) + def test_no_can_seek_beginning_with_seek_beginning(self): + # Test an iterator without a _user_can_seek_beginning method, but with + # a _user_seek_beginning method. + class MySink(bt2._UserSinkComponent): + def __init__(self, params, obj): + self._add_input_port('in') - def test_seek_beginning(self): - it, MySourceIter = self._setup_seek_beginning_test() + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) - msg = next(it) - self.assertIsInstance(msg, bt2._StreamBeginningMessage) - msg = next(it) - self.assertIsInstance(msg, bt2._PacketBeginningMessage) + def _user_consume(self): + nonlocal can_seek_beginning + can_seek_beginning = self._msg_iter.can_seek_beginning - it.seek_beginning() + def _user_seek_beginning(self): + pass - msg = next(it) - self.assertIsInstance(msg, bt2._StreamBeginningMessage) - - # Verify that we can seek beginning after having reached the end. - # - # It currently does not work to seek an output port message iterator - # once it's ended, but we should eventually make it work and uncomment - # the following snippet. - # - # try: - # while True: - # next(it) - # except bt2.Stop: - # pass - # - # it.seek_beginning() - # msg = next(it) - # self.assertIsInstance(msg, bt2._StreamBeginningMessage) + graph = _setup_seek_test(MySink, user_seek_beginning=_user_seek_beginning) + can_seek_beginning = None + graph.run_once() + self.assertTrue(can_seek_beginning) - def test_seek_beginning_user_error(self): - it, MySourceIter = self._setup_seek_beginning_test() + def test_no_can_seek_beginning(self): + # Test an iterator without a _user_can_seek_beginning method, without + # a _user_seek_beginning method. + class MySink(bt2._UserSinkComponent): + def __init__(self, params, obj): + self._add_input_port('in') - def _seek_beginning_error(self): - raise ValueError('ouch') + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) - MySourceIter._seek_beginning = _seek_beginning_error + def _user_consume(self): + nonlocal can_seek_beginning + can_seek_beginning = self._msg_iter.can_seek_beginning - with self.assertRaises(bt2._Error): - it.seek_beginning() + graph = _setup_seek_test(MySink) + can_seek_beginning = None + graph.run_once() + self.assertFalse(can_seek_beginning) - # Try consuming many times from an iterator that always returns TryAgain. - # This verifies that we are not missing an incref of Py_None, making the - # refcount of Py_None reach 0. - def test_try_again_many_times(self): - class MyIter(bt2._UserMessageIterator): - def __next__(self): - raise bt2.TryAgain + def test_can_seek_beginning_user_error(self): + class MySink(bt2._UserSinkComponent): + def __init__(self, params, obj): + self._add_input_port('in') - class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): - def __init__(self, params): - self._add_output_port('out') + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) - graph = bt2.Graph() - src = graph.add_component(MySource, 'src') - it = graph.create_output_port_message_iterator(src.output_ports['out']) + def _user_consume(self): + # This is expected to raise. + self._msg_iter.can_seek_beginning - # The initial refcount of Py_None was in the 7000, so 100000 iterations - # should be enough to catch the bug even if there are small differences - # between configurations. - for i in range(100000): - with self.assertRaises(bt2.TryAgain): - next(it) + def _user_can_seek_beginning(self): + raise ValueError('moustiquaire') + graph = _setup_seek_test( + MySink, user_can_seek_beginning=_user_can_seek_beginning + ) -class OutputPortMessageIteratorTestCase(unittest.TestCase): - def test_component(self): - class MyIter(bt2._UserMessageIterator): - def __init__(self, self_port_output): - self._at = 0 + with self.assertRaises(bt2._Error) as ctx: + graph.run_once() - def __next__(self): - if self._at == 7: - raise bt2.Stop - - if self._at == 0: - msg = self._create_stream_beginning_message(test_obj._stream) - elif self._at == 1: - msg = self._create_packet_beginning_message(test_obj._packet) - elif self._at == 5: - msg = self._create_packet_end_message(test_obj._packet) - 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.event.payload_field['my_int'] = self._at * 3 + cause = ctx.exception[0] + self.assertIn('ValueError: moustiquaire', cause.message) - self._at += 1 - return msg + def test_can_seek_beginning_wrong_return_value(self): + class MySink(bt2._UserSinkComponent): + def __init__(self, params, obj): + self._add_input_port('in') - class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): - def __init__(self, params): - self._add_output_port('out') + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) + + def _user_consume(self): + # This is expected to raise. + self._msg_iter.can_seek_beginning - trace_class = self._create_trace_class() - stream_class = trace_class.create_stream_class(supports_packets=True) + def _user_can_seek_beginning(self): + return 'Amqui' - # 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 += [('my_int', my_int_ft)] + graph = _setup_seek_test( + MySink, user_can_seek_beginning=_user_can_seek_beginning + ) + + with self.assertRaises(bt2._Error) as ctx: + graph.run_once() + + cause = ctx.exception[0] + self.assertIn("TypeError: 'str' is not a 'bool' object", cause.message) - event_class = stream_class.create_event_class( - name='salut', payload_field_class=payload_ft + def test_seek_beginning(self): + class MySink(bt2._UserSinkComponent): + def __init__(self, params, obj): + self._add_input_port('in') + + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] ) - trace = trace_class() - stream = trace.create_stream(stream_class) - packet = stream.create_packet() + def _user_consume(self): + nonlocal do_seek_beginning + nonlocal msg - test_obj._event_class = event_class - test_obj._stream = stream - test_obj._packet = packet + if do_seek_beginning: + self._msg_iter.seek_beginning() + return - test_obj = self - graph = bt2.Graph() - src = graph.add_component(MySource, 'src') - msg_iter = graph.create_output_port_message_iterator(src.output_ports['out']) - - for at, msg in enumerate(msg_iter): - if at == 0: - self.assertIsInstance(msg, bt2._StreamBeginningMessage) - elif at == 1: - self.assertIsInstance(msg, bt2._PacketBeginningMessage) - elif at == 5: - self.assertIsInstance(msg, bt2._PacketEndMessage) - elif at == 6: - self.assertIsInstance(msg, bt2._StreamEndMessage) - else: - self.assertIsInstance(msg, bt2._EventMessage) - self.assertEqual(msg.event.cls.name, 'salut') - field = msg.event.payload_field['my_int'] - self.assertEqual(field, at * 3) + msg = next(self._msg_iter) + + def _user_seek_beginning(self): + self._at = 0 + + msg = None + graph = _setup_seek_test(MySink, user_seek_beginning=_user_seek_beginning) + + # Consume message. + do_seek_beginning = False + graph.run_once() + self.assertIs(type(msg), bt2._StreamBeginningMessageConst) + + # Consume message. + graph.run_once() + self.assertIs(type(msg), bt2._PacketBeginningMessageConst) + + # Seek beginning. + do_seek_beginning = True + graph.run_once() + + # Consume message. + do_seek_beginning = False + graph.run_once() + self.assertIs(type(msg), bt2._StreamBeginningMessageConst) + + def test_seek_beginning_user_error(self): + class MySink(bt2._UserSinkComponent): + def __init__(self, params, obj): + self._add_input_port('in') + + def _user_graph_is_configured(self): + self._msg_iter = self._create_input_port_message_iterator( + self._input_ports['in'] + ) + + def _user_consume(self): + self._msg_iter.seek_beginning() + + def _user_seek_beginning(self): + raise ValueError('ouch') + + graph = _setup_seek_test(MySink, user_seek_beginning=_user_seek_beginning) + + with self.assertRaises(bt2._Error): + graph.run_once() if __name__ == '__main__':