bt2: Adapt test_trace_collection_message_iterator.py and make it pass

[babeltrace.git] / tests / bindings / python / bt2 / test_trace_collection_message_iterator.py

diff --git a/tests/bindings/python/bt2/test_trace_collection_message_iterator.py b/tests/bindings/python/bt2/test_trace_collection_message_iterator.py
index 12492740631ed0413870db2c0458b50d5ffd0b58..e30cad4332ca3b4dda88d83985480e95eaf36f0b 100644 (file)
--- a/tests/bindings/python/bt2/test_trace_collection_message_iterator.py
+++ b/tests/bindings/python/bt2/test_trace_collection_message_iterator.py
@@ -1,7 +1,5 @@
 import unittest
 import datetime
-import copy
-import uuid
 import bt2
 import os
 import os.path
@@ -13,133 +11,141 @@ _3EVENTS_INTERSECT_TRACE_PATH = os.path.join(_TEST_CTF_TRACES_PATH,
                                              '3eventsintersect')
 
 
-@unittest.skip("this is broken")
 class ComponentSpecTestCase(unittest.TestCase):
     def test_create_good_no_params(self):
-        spec = bt2.ComponentSpec('plugin', 'compcls')
+        bt2.ComponentSpec('plugin', 'compcls')
 
     def test_create_good_with_params(self):
-        spec = bt2.ComponentSpec('plugin', 'compcls', {'salut': 23})
+        bt2.ComponentSpec('plugin', 'compcls', {'salut': 23})
 
     def test_create_good_with_path_params(self):
         spec = bt2.ComponentSpec('plugin', 'compcls', 'a path')
-        self.assertEqual(spec.params['path'], 'a path')
+        self.assertEqual(spec.params['paths'], ['a path'])
 
     def test_create_wrong_plugin_name_type(self):
         with self.assertRaises(TypeError):
-            spec = bt2.ComponentSpec(23, 'compcls')
+            bt2.ComponentSpec(23, 'compcls')
 
     def test_create_wrong_component_class_name_type(self):
         with self.assertRaises(TypeError):
-            spec = bt2.ComponentSpec('plugin', 190)
+            bt2.ComponentSpec('plugin', 190)
 
     def test_create_wrong_params_type(self):
         with self.assertRaises(TypeError):
-            spec = bt2.ComponentSpec('dwdw', 'compcls', datetime.datetime.now())
+            bt2.ComponentSpec('dwdw', 'compcls', datetime.datetime.now())
+
+
+# Return a map, msg type -> number of messages of this type.
+
+def _count_msgs_by_type(msgs):
+    res = {}
+
+    for msg in msgs:
+        t = type(msg)
+        n = res.get(t, 0)
+        res[t] = n + 1
+
+    return res
 
 
-@unittest.skip("this is broken")
 class TraceCollectionMessageIteratorTestCase(unittest.TestCase):
     def test_create_wrong_stream_intersection_mode_type(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
 
         with self.assertRaises(TypeError):
-            msg_iter = bt2.TraceCollectionMessageIterator(specs, stream_intersection_mode=23)
+            bt2.TraceCollectionMessageIterator(specs, stream_intersection_mode=23)
 
     def test_create_wrong_begin_type(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
 
         with self.assertRaises(TypeError):
-            msg_iter = bt2.TraceCollectionMessageIterator(specs, begin='hi')
+            bt2.TraceCollectionMessageIterator(specs, begin='hi')
 
     def test_create_wrong_end_type(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
 
         with self.assertRaises(TypeError):
-            msg_iter = bt2.TraceCollectionMessageIterator(specs, begin='lel')
+            bt2.TraceCollectionMessageIterator(specs, begin='lel')
 
     def test_create_no_such_plugin(self):
         specs = [bt2.ComponentSpec('77', '101', _3EVENTS_INTERSECT_TRACE_PATH)]
 
         with self.assertRaises(bt2.Error):
-            msg_iter = bt2.TraceCollectionMessageIterator(specs)
+            bt2.TraceCollectionMessageIterator(specs)
 
     def test_create_begin_s(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
-        msg_iter = bt2.TraceCollectionMessageIterator(specs, begin=19457.918232)
+        bt2.TraceCollectionMessageIterator(specs, begin=19457.918232)
 
     def test_create_end_s(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
-        msg_iter = bt2.TraceCollectionMessageIterator(specs, end=123.12312)
+        bt2.TraceCollectionMessageIterator(specs, end=123.12312)
 
     def test_create_begin_datetime(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
-        msg_iter = bt2.TraceCollectionMessageIterator(specs, begin=datetime.datetime.now())
+        bt2.TraceCollectionMessageIterator(specs, begin=datetime.datetime.now())
 
     def test_create_end_datetime(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
-        msg_iter = bt2.TraceCollectionMessageIterator(specs, end=datetime.datetime.now())
+        bt2.TraceCollectionMessageIterator(specs, end=datetime.datetime.now())
 
     def test_iter_no_intersection(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
         msg_iter = bt2.TraceCollectionMessageIterator(specs)
-        self.assertEqual(len(list(msg_iter)), 28)
-
-    def test_iter_no_intersection_subscribe(self):
-        specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
-        msg_iter = bt2.TraceCollectionMessageIterator(specs,
-                                                             message_types=[bt2.EventMessage])
-        self.assertEqual(len(list(msg_iter)), 8)
+        msgs = list(msg_iter)
+        self.assertEqual(len(msgs), 32)
+        hist = _count_msgs_by_type(msgs)
+        self.assertEqual(hist[bt2.message._EventMessage], 8)
 
+    # Same as the above, but we pass a single spec instead of a spec list.
     def test_iter_specs_not_list(self):
         spec = bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)
-        msg_iter = bt2.TraceCollectionMessageIterator(spec,
-                                                             message_types=[bt2.EventMessage])
-        self.assertEqual(len(list(msg_iter)), 8)
+        msg_iter = bt2.TraceCollectionMessageIterator(spec)
+        msgs = list(msg_iter)
+        self.assertEqual(len(msgs), 32)
+        hist = _count_msgs_by_type(msgs)
+        self.assertEqual(hist[bt2.message._EventMessage], 8)
 
     def test_iter_custom_filter(self):
         src_spec = bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)
         flt_spec = bt2.ComponentSpec('utils', 'trimmer', {
-            'end': 13515309000000075,
+            'end': '13515309.000000075',
         })
-        msg_iter = bt2.TraceCollectionMessageIterator(src_spec, flt_spec,
-                                                             message_types=[bt2.EventMessage])
-        self.assertEqual(len(list(msg_iter)), 5)
+        msg_iter = bt2.TraceCollectionMessageIterator(src_spec, flt_spec)
+        hist = _count_msgs_by_type(msg_iter)
+        self.assertEqual(hist[bt2.message._EventMessage], 5)
 
     def test_iter_intersection(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
         msg_iter = bt2.TraceCollectionMessageIterator(specs, stream_intersection_mode=True)
-        self.assertEqual(len(list(msg_iter)), 15)
-
-    def test_iter_intersection_subscribe(self):
-        specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
-        msg_iter = bt2.TraceCollectionMessageIterator(specs, stream_intersection_mode=True,
-                                                             message_types=[bt2.EventMessage])
-        self.assertEqual(len(list(msg_iter)), 3)
+        msgs = list(msg_iter)
+        self.assertEqual(len(msgs), 19)
+        hist = _count_msgs_by_type(msgs)
+        self.assertEqual(hist[bt2.message._EventMessage], 3)
 
     def test_iter_intersection_no_path_param(self):
         specs = [bt2.ComponentSpec('text', 'dmesg', {'read-from-stdin': True})]
 
         with self.assertRaises(bt2.Error):
-            msg_iter = bt2.TraceCollectionMessageIterator(specs, stream_intersection_mode=True,
-                                                                 message_types=[bt2.EventMessage])
+            bt2.TraceCollectionMessageIterator(specs, stream_intersection_mode=True)
 
     def test_iter_no_intersection_two_traces(self):
         spec = bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)
         specs = [spec, spec]
         msg_iter = bt2.TraceCollectionMessageIterator(specs)
-        self.assertEqual(len(list(msg_iter)), 56)
+        msgs = list(msg_iter)
+        self.assertEqual(len(msgs), 64)
+        hist = _count_msgs_by_type(msgs)
+        self.assertEqual(hist[bt2.message._EventMessage], 16)
 
     def test_iter_no_intersection_begin(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
-        msg_iter = bt2.TraceCollectionMessageIterator(specs,
-                                                             message_types=[bt2.EventMessage],
-                                                             begin=13515309.000000023)
-        self.assertEqual(len(list(msg_iter)), 6)
+        msg_iter = bt2.TraceCollectionMessageIterator(specs, begin=13515309.000000023)
+        hist = _count_msgs_by_type(msg_iter)
+        self.assertEqual(hist[bt2.message._EventMessage], 6)
 
     def test_iter_no_intersection_end(self):
         specs = [bt2.ComponentSpec('ctf', 'fs', _3EVENTS_INTERSECT_TRACE_PATH)]
-        msg_iter = bt2.TraceCollectionMessageIterator(specs,
-                                                             message_types=[bt2.EventMessage],
-                                                             end=13515309.000000075)
-        self.assertEqual(len(list(msg_iter)), 5)
+        msg_iter = bt2.TraceCollectionMessageIterator(specs, end=13515309.000000075)
+        hist = _count_msgs_by_type(msg_iter)
+        self.assertEqual(hist[bt2.message._EventMessage], 5)