X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_clock_class.py;h=9bc6bae7497593be6b15e7da9ccd941268b19f30;hb=84eba0d9b419444e95b2f560c660ea57bb2142d8;hp=1f3959127208b274f23b0a3615ee05ac9f436631;hpb=fb25b9e364c8eab9fe5e37947831e233086c7218;p=babeltrace.git

diff --git a/tests/bindings/python/bt2/test_clock_class.py b/tests/bindings/python/bt2/test_clock_class.py
index 1f395912..9bc6bae7 100644
--- a/tests/bindings/python/bt2/test_clock_class.py
+++ b/tests/bindings/python/bt2/test_clock_class.py
@@ -18,9 +18,8 @@
 
 import unittest
 import uuid
-import copy
 import bt2
-from utils import run_in_component_init
+from utils import run_in_component_init, TestOutputPortMessageIterator
 
 
 class ClockClassOffsetTestCase(unittest.TestCase):
@@ -169,7 +168,9 @@ class ClockClassTestCase(unittest.TestCase):
 
     def test_cycles_to_ns_from_origin(self):
         def f(comp_self):
-            return comp_self._create_clock_class(frequency=10**8, origin_is_unix_epoch=True)
+            return comp_self._create_clock_class(
+                frequency=10 ** 8, origin_is_unix_epoch=True
+            )
 
         cc = run_in_component_init(f)
         self.assertEqual(cc.cycles_to_ns_from_origin(112), 1120)
@@ -179,12 +180,14 @@ class ClockClassTestCase(unittest.TestCase):
             return comp_self._create_clock_class(frequency=1000)
 
         cc = run_in_component_init(f)
-        with self.assertRaises(bt2.OverflowError):
-            cc.cycles_to_ns_from_origin(2**63)
+        with self.assertRaises(bt2._OverflowError):
+            cc.cycles_to_ns_from_origin(2 ** 63)
 
     def test_create_uuid(self):
         def f(comp_self):
-            return comp_self._create_clock_class(uuid=uuid.UUID('b43372c32ef0be28444dfc1c5cdafd33'))
+            return comp_self._create_clock_class(
+                uuid=uuid.UUID('b43372c32ef0be28444dfc1c5cdafd33')
+            )
 
         cc = run_in_component_init(f)
         self.assertEqual(cc.uuid, uuid.UUID('b43372c32ef0be28444dfc1c5cdafd33'))
@@ -199,21 +202,18 @@ class ClockClassTestCase(unittest.TestCase):
 class ClockSnapshotTestCase(unittest.TestCase):
     def setUp(self):
         def f(comp_self):
-            cc = comp_self._create_clock_class(1000, 'my_cc',
-                                               offset=bt2.ClockClassOffset(45, 354))
+            cc = comp_self._create_clock_class(
+                1000, 'my_cc', offset=bt2.ClockClassOffset(45, 354)
+            )
             tc = comp_self._create_trace_class()
 
             return (cc, tc)
 
         _cc, _tc = run_in_component_init(f)
         _trace = _tc()
-        _sc = _tc.create_stream_class(default_clock_class=_cc,
-                                      packets_have_beginning_default_clock_snapshot=True,
-                                      packets_have_end_default_clock_snapshot=True)
+        _sc = _tc.create_stream_class(default_clock_class=_cc)
         _ec = _sc.create_event_class(name='salut')
         _stream = _trace.create_stream(_sc)
-        _packet = _stream.create_packet()
-        self._packet = _packet
         self._stream = _stream
         self._ec = _ec
         self._cc = _cc
@@ -226,14 +226,10 @@ class ClockSnapshotTestCase(unittest.TestCase):
                 if self._at == 0:
                     notif = self._create_stream_beginning_message(_stream)
                 elif self._at == 1:
-                    notif = self._create_packet_beginning_message(_packet, 100)
+                    notif = self._create_event_message(_ec, _stream, 123)
                 elif self._at == 2:
-                    notif = self._create_event_message(_ec, _packet, 123)
+                    notif = self._create_event_message(_ec, _stream, 2 ** 63)
                 elif self._at == 3:
-                    notif = self._create_event_message(_ec, _packet, 2**63)
-                elif self._at == 4:
-                    notif = self._create_packet_end_message(_packet)
-                elif self._at == 5:
                     notif = self._create_stream_end_message(_stream)
                 else:
                     raise bt2.Stop
@@ -242,18 +238,19 @@ class ClockSnapshotTestCase(unittest.TestCase):
                 return notif
 
         class MySrc(bt2._UserSourceComponent, message_iterator_class=MyIter):
-            def __init__(self, params):
+            def __init__(self, params, obj):
                 self._add_output_port('out')
 
         self._graph = bt2.Graph()
         self._src_comp = self._graph.add_component(MySrc, 'my_source')
-        self._msg_iter = self._graph.create_output_port_message_iterator(
-            self._src_comp.output_ports['out'])
+        self._msg_iter = TestOutputPortMessageIterator(
+            self._graph, self._src_comp.output_ports['out']
+        )
 
         for i, msg in enumerate(self._msg_iter):
-            if i == 2:
+            if i == 1:
                 self._msg = msg
-            elif i == 3:
+            elif i == 2:
                 self._msg_clock_overflow = msg
                 break
 
@@ -263,21 +260,24 @@ class ClockSnapshotTestCase(unittest.TestCase):
 
     def test_create_default(self):
         self.assertEqual(
-            self._msg.default_clock_snapshot.clock_class.addr, self._cc.addr)
+            self._msg.default_clock_snapshot.clock_class.addr, self._cc.addr
+        )
         self.assertEqual(self._msg.default_clock_snapshot.value, 123)
 
     def test_clock_class(self):
         self.assertEqual(
-            self._msg.default_clock_snapshot.clock_class.addr, self._cc.addr)
+            self._msg.default_clock_snapshot.clock_class.addr, self._cc.addr
+        )
 
     def test_ns_from_origin(self):
         s_from_origin = 45 + ((354 + 123) / 1000)
         ns_from_origin = int(s_from_origin * 1e9)
         self.assertEqual(
-            self._msg.default_clock_snapshot.ns_from_origin, ns_from_origin)
+            self._msg.default_clock_snapshot.ns_from_origin, ns_from_origin
+        )
 
     def test_ns_from_origin_overflow(self):
-        with self.assertRaises(bt2.OverflowError):
+        with self.assertRaises(bt2._OverflowError):
             self._msg_clock_overflow.default_clock_snapshot.ns_from_origin
 
     def test_eq_int(self):