X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fdata%2Fplugins%2Fflt.utils.muxer%2Fbt_plugin_muxer_test.py;h=8c2c4560cf31cf98121218cc3503ab5fe4915a1f;hb=75882e97aed48428d4a0abc32a6382be811ad994;hp=ac2ee597572470195a2d2fc7a12d128d5a65342e;hpb=38403bf59288e53839f191f6da34792d9439528b;p=babeltrace.git diff --git a/tests/data/plugins/flt.utils.muxer/bt_plugin_muxer_test.py b/tests/data/plugins/flt.utils.muxer/bt_plugin_muxer_test.py index ac2ee597..8c2c4560 100644 --- a/tests/data/plugins/flt.utils.muxer/bt_plugin_muxer_test.py +++ b/tests/data/plugins/flt.utils.muxer/bt_plugin_muxer_test.py @@ -2,7 +2,7 @@ import bt2 class TheIteratorOfConfusion(bt2._UserMessageIterator): - def __init__(self, port): + def __init__(self, config, port): self._at = 0 test_name = port.user_data[0] TEST_CASES[test_name].create_msgs(self, port.user_data[1:]) @@ -19,9 +19,7 @@ class TheIteratorOfConfusion(bt2._UserMessageIterator): class TheSourceOfConfusion( bt2._UserSourceComponent, message_iterator_class=TheIteratorOfConfusion ): - def __init__(self, params, obj): - tc = self._create_trace_class() - + def __init__(self, config, params, obj): test_name = str(params['test-name']) TEST_CASES[test_name].source_setup(self, test_name) @@ -49,7 +47,7 @@ class DiffTraceName: stream = trace.create_stream(sc, 0) sb_msg = msg_iter._create_stream_beginning_message(stream, 0) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, se_msg] @@ -76,7 +74,7 @@ class DiffStreamName: stream = trace.create_stream(sc, 0, stream_name) sb_msg = msg_iter._create_stream_beginning_message(stream, 0) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, se_msg] @@ -103,7 +101,7 @@ class DiffStreamId: stream = trace.create_stream(sc, stream_id) sb_msg = msg_iter._create_stream_beginning_message(stream, 0) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, se_msg] @@ -130,7 +128,7 @@ class DiffStreamNoName: stream = trace.create_stream(sc, 0, name=stream_no_name) sb_msg = msg_iter._create_stream_beginning_message(stream, 0) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, se_msg] @@ -159,7 +157,7 @@ class DiffStreamClassId: stream = trace.create_stream(sc, 0) sb_msg = msg_iter._create_stream_beginning_message(stream, 0) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, se_msg] @@ -189,7 +187,7 @@ class DiffStreamClassName: stream = trace.create_stream(sc, 0) sb_msg = msg_iter._create_stream_beginning_message(stream, 0) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, se_msg] @@ -219,7 +217,7 @@ class DiffStreamClassNoName: stream = trace.create_stream(sc, 0) sb_msg = msg_iter._create_stream_beginning_message(stream, 0) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, se_msg] @@ -244,7 +242,7 @@ class BasicTimestampOrdering: stream = trace.create_stream(sc) sb_msg = msg_iter._create_stream_beginning_message(stream, timestamp) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, se_msg] @@ -284,7 +282,7 @@ class MultiIterOrdering: msg_iter._create_event_message( event_class, sc_0_stream_1, clock_snapshot_value ), - msg_iter._create_stream_end_message(sc_0_stream_1, iter_id*193) + msg_iter._create_stream_end_message(sc_0_stream_1, iter_id * 193), ] elif iter_id == 2: # Packet beginning, 2500 ns, trace "meow", stream class 0, stream 1 @@ -303,8 +301,8 @@ class MultiIterOrdering: msg_iter._msgs = [ msg_iter._create_stream_beginning_message(sc_0_stream_1, 1), msg_iter._create_packet_beginning_message(packet, clock_snapshot_value), - msg_iter._create_packet_end_message(packet, iter_id*79), - msg_iter._create_stream_end_message(sc_0_stream_1, iter_id*193) + msg_iter._create_packet_end_message(packet, iter_id * 79), + msg_iter._create_stream_end_message(sc_0_stream_1, iter_id * 193), ] elif iter_id == 3: # Stream beginning, 2500 ns, trace "hello", stream class 0, stream 0 @@ -318,7 +316,7 @@ class MultiIterOrdering: msg_iter._create_stream_beginning_message( sc_0_stream_0, clock_snapshot_value ), - msg_iter._create_stream_end_message(sc_0_stream_0, iter_id*193) + msg_iter._create_stream_end_message(sc_0_stream_0, iter_id * 193), ] elif iter_id == 4: # Event, 2500 ns, trace "meow", stream class 1, stream 1 @@ -334,7 +332,7 @@ class MultiIterOrdering: msg_iter._create_event_message( event_class, sc_1_stream_1, clock_snapshot_value ), - msg_iter._create_stream_end_message(sc_1_stream_1, iter_id*193) + msg_iter._create_stream_end_message(sc_1_stream_1, iter_id * 193), ] @@ -369,7 +367,7 @@ class DiffEventClassName: # event message. sb_msg = msg_iter._create_stream_beginning_message(stream, len(ec.name)) ev_msg = msg_iter._create_event_message(ec, stream, 50) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, ev_msg, se_msg] @@ -405,7 +403,7 @@ class DiffEventClassId: # are not at the same time. This test is targetting event message. sb_msg = msg_iter._create_stream_beginning_message(stream, ec.id) ev_msg = msg_iter._create_event_message(ec, stream, 50) - se_msg = msg_iter._create_stream_end_message(stream, iter_id*193) + se_msg = msg_iter._create_stream_end_message(stream, iter_id * 193) msg_iter._msgs = [sb_msg, ev_msg, se_msg] @@ -423,7 +421,7 @@ class DiffInactivityMsgCs: src._add_output_port('out2', (test_name, cc2)) def create_msgs(msg_iter, params): - cc, = params + (cc,) = params sb_msg = msg_iter._create_message_iterator_inactivity_message(cc, 0) msg_iter._msgs = [sb_msg]