tap-driver.sh: flush stdout after each test result

[babeltrace.git] / bindings / python / bt2 / bt2 / message_iterator.py

diff --git a/bindings/python/bt2/bt2/message_iterator.py b/bindings/python/bt2/bt2/message_iterator.py
index 7ac98f3dfcf64c35792972ae675c9a7695c757c6..7f996b007e1ec8353fb3537fd45d0fdd80823c66 100644 (file)
--- a/bindings/python/bt2/bt2/message_iterator.py
+++ b/bindings/python/bt2/bt2/message_iterator.py
@@ -150,9 +150,9 @@ class _UserMessageIterator(_MessageIterator):
                 'stream class has no default clock class, default_clock_snapshot should be None')
 
     def _create_event_message(self, event_class, packet, default_clock_snapshot=None):
-        utils._check_type(event_class, bt2.event_class.EventClass)
+        utils._check_type(event_class, bt2.event_class._EventClass)
         utils._check_type(packet, bt2.packet._Packet)
-        self._validate_default_clock_snapshot(packet.stream.stream_class, default_clock_snapshot)
+        self._validate_default_clock_snapshot(packet.stream.cls, default_clock_snapshot)
 
         if default_clock_snapshot is not None:
             utils._check_uint64(default_clock_snapshot)
@@ -188,7 +188,7 @@ class _UserMessageIterator(_MessageIterator):
 
     def _create_stream_activity_beginning_message(self, stream, default_clock_snapshot=None):
         utils._check_type(stream, bt2.stream._Stream)
-        self._validate_default_clock_snapshot(stream.stream_class, default_clock_snapshot)
+        self._validate_default_clock_snapshot(stream.cls, default_clock_snapshot)
 
         ptr = native_bt.message_stream_activity_beginning_create(self._ptr, stream._ptr)
 
@@ -205,7 +205,7 @@ class _UserMessageIterator(_MessageIterator):
 
     def _create_stream_activity_end_message(self, stream, default_clock_snapshot=None):
         utils._check_type(stream, bt2.stream._Stream)
-        self._validate_default_clock_snapshot(stream.stream_class, default_clock_snapshot)
+        self._validate_default_clock_snapshot(stream.cls, default_clock_snapshot)
 
         ptr = native_bt.message_stream_activity_end_create(self._ptr, stream._ptr)
 
@@ -232,7 +232,7 @@ class _UserMessageIterator(_MessageIterator):
     def _create_packet_beginning_message(self, packet, default_clock_snapshot=None):
         utils._check_type(packet, bt2.packet._Packet)
 
-        if packet.stream.stream_class.packets_have_default_beginning_clock_snapshot:
+        if packet.stream.cls.packets_have_beginning_default_clock_snapshot:
             if default_clock_snapshot is None:
                 raise ValueError("packet beginning messages in this stream must have a default clock snapshots")
 
@@ -253,7 +253,7 @@ class _UserMessageIterator(_MessageIterator):
     def _create_packet_end_message(self, packet, default_clock_snapshot=None):
         utils._check_type(packet, bt2.packet._Packet)
 
-        if packet.stream.stream_class.packets_have_default_end_clock_snapshot:
+        if packet.stream.cls.packets_have_end_default_clock_snapshot:
             if default_clock_snapshot is None:
                 raise ValueError("packet end messages in this stream must have a default clock snapshots")
 
@@ -276,15 +276,23 @@ class _UserMessageIterator(_MessageIterator):
                                          end_clock_snapshot=None):
         utils._check_type(stream, bt2.stream._Stream)
 
-        if beg_clock_snapshot is None and end_clock_snapshot is None:
-            ptr = native_bt.message_discarded_events_create(self._ptr, stream._ptr)
-        elif beg_clock_snapshot is not None and end_clock_snapshot is not None:
+        if not stream.cls.supports_discarded_events:
+            raise ValueError('stream class does not support discarded events')
+
+        if stream.cls.discarded_events_have_default_clock_snapshots:
+            if beg_clock_snapshot is None or end_clock_snapshot is None:
+                raise ValueError('discarded events have default clock snapshots for this stream class')
+
             utils._check_uint64(beg_clock_snapshot)
             utils._check_uint64(end_clock_snapshot)
             ptr = native_bt.message_discarded_events_create_with_default_clock_snapshots(
                 self._ptr, stream._ptr, beg_clock_snapshot, end_clock_snapshot)
         else:
-            raise ValueError('begin and end clock snapshots must be both provided or both omitted')
+            if beg_clock_snapshot is not None or end_clock_snapshot is not None:
+                raise ValueError('discarded events have no default clock snapshots for this stream class')
+
+            ptr = native_bt.message_discarded_events_create(
+                self._ptr, stream._ptr)
 
         if ptr is None:
             raise bt2.CreationError('cannot discarded events message object')
@@ -299,15 +307,23 @@ class _UserMessageIterator(_MessageIterator):
     def _create_discarded_packets_message(self, stream, count=None, beg_clock_snapshot=None, end_clock_snapshot=None):
         utils._check_type(stream, bt2.stream._Stream)
 
-        if beg_clock_snapshot is None and end_clock_snapshot is None:
-            ptr = native_bt.message_discarded_packets_create(self._ptr, stream._ptr)
-        elif beg_clock_snapshot is not None and end_clock_snapshot is not None:
+        if not stream.cls.supports_discarded_packets:
+            raise ValueError('stream class does not support discarded packets')
+
+        if stream.cls.discarded_packets_have_default_clock_snapshots:
+            if beg_clock_snapshot is None or end_clock_snapshot is None:
+                raise ValueError('discarded packets have default clock snapshots for this stream class')
+
             utils._check_uint64(beg_clock_snapshot)
             utils._check_uint64(end_clock_snapshot)
             ptr = native_bt.message_discarded_packets_create_with_default_clock_snapshots(
                 self._ptr, stream._ptr, beg_clock_snapshot, end_clock_snapshot)
         else:
-            raise ValueError('begin and end clock snapshots must be both provided or both omitted')
+            if beg_clock_snapshot is not None or end_clock_snapshot is not None:
+                raise ValueError('discarded packets have no default clock snapshots for this stream class')
+
+            ptr = native_bt.message_discarded_packets_create(
+                self._ptr, stream._ptr)
 
         if ptr is None:
             raise bt2.CreationError('cannot discarded packets message object')