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=770f2cc5ca8ef451dd31f367b33269b2731b8122;hp=a59ea9bd1bebf432ea6fbb78356b960ac3d1f441;hb=e90ed87f10f39cabed0190ac06cfc3f4bfae73f0;hpb=21f6a44aa276c89662ff38acd13d84239493d6de

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 a59ea9bd..770f2cc5 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
@@ -7,30 +7,39 @@ class TheIteratorOfAllEvil(bt2._UserMessageIterator):
         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
 
@@ -53,15 +62,17 @@ class TheSourceOfAllEvil(
     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')