X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Fdata%2Fplugins%2Fflt.utils.trimmer%2Fbt_plugin_trimmer_test.py;h=8ce29f03b62511d9a0833639392c58d95cef6365;hp=c7d5985dffd001143305621121f53ed73a91d2c9;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=66964f3f7b0b7e3b774ddb043b0f197018d23730

diff --git a/tests/data/plugins/flt.utils.trimmer/bt_plugin_trimmer_test.py b/tests/data/plugins/flt.utils.trimmer/bt_plugin_trimmer_test.py
index c7d5985d..8ce29f03 100644
--- a/tests/data/plugins/flt.utils.trimmer/bt_plugin_trimmer_test.py
+++ b/tests/data/plugins/flt.utils.trimmer/bt_plugin_trimmer_test.py
@@ -1,37 +1,52 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2019 EfficiOS Inc.
+#
+
 import bt2
 
 
 class TheIteratorOfAllEvil(bt2._UserMessageIterator):
-    def __init__(self, port):
+    def __init__(self, config, port):
         tc, sc, ec1, ec2, params = port.user_data
         trace = tc()
         stream = trace.create_stream(sc)
 
-        # Test with and without packets, once packets are optional.
-        packet = stream.create_packet()
+        if params['with-packet-msgs']:
+            packet = stream.create_packet()
 
         if params['with-stream-msgs-cs']:
             sb_msg = self._create_stream_beginning_message(stream, 100)
         else:
             sb_msg = self._create_stream_beginning_message(stream)
 
-        ev_msg1 = self._create_event_message(ec1, packet, 300)
-        ev_msg2 = self._create_event_message(ec2, packet, 400)
+        parent = packet if params['with-packet-msgs'] else stream
+
+        ev_msg1 = self._create_event_message(ec1, parent, 300)
+        ev_msg2 = self._create_event_message(ec2, parent, 400)
 
         if params['with-stream-msgs-cs']:
             se_msg = self._create_stream_end_message(stream, 1000)
         else:
             se_msg = self._create_stream_end_message(stream)
 
-        self._msgs = [
-            sb_msg,
-            self._create_packet_beginning_message(packet, 200),
-            ev_msg1,
-            ev_msg2,
-            self._create_packet_end_message(packet, 900),
-            se_msg,
-        ]
+        self._msgs = []
+
+        self._msgs.append(sb_msg)
+
+        if params['with-packet-msgs']:
+            self._msgs.append(self._create_packet_beginning_message(packet, 200))
+
+        self._msgs.append(ev_msg1)
+        self._msgs.append(ev_msg2)
+
+        if params['with-packet-msgs']:
+            self._msgs.append(self._create_packet_end_message(packet, 900))
+
+        self._msgs.append(se_msg)
+
         self._at = 0
+        config.can_seek_forward = True
 
     def _user_seek_beginning(self):
         self._at = 0
@@ -49,18 +64,20 @@ class TheIteratorOfAllEvil(bt2._UserMessageIterator):
 class TheSourceOfAllEvil(
     bt2._UserSourceComponent, message_iterator_class=TheIteratorOfAllEvil
 ):
-    def __init__(self, params, obj):
+    def __init__(self, config, params, obj):
         tc = self._create_trace_class()
 
+        with_packets = bool(params['with-packet-msgs'])
+
         # Use a clock class with an offset, so we can test with --begin or --end
         # smaller than this offset (in other words, a time that it's not
         # possible to represent with this clock class).
         cc = self._create_clock_class(frequency=1, offset=bt2.ClockClassOffset(10000))
         sc = tc.create_stream_class(
             default_clock_class=cc,
-            supports_packets=True,
-            packets_have_beginning_default_clock_snapshot=True,
-            packets_have_end_default_clock_snapshot=True,
+            supports_packets=with_packets,
+            packets_have_beginning_default_clock_snapshot=with_packets,
+            packets_have_end_default_clock_snapshot=with_packets,
         )
         ec1 = sc.create_event_class(name='event 1')
         ec2 = sc.create_event_class(name='event 2')