Add `babeltrace.` prefix to `trace-info` and `support-info` query objects

[babeltrace.git] / tests / plugins / src.ctf.fs / query / test_query_trace_info.py

diff --git a/tests/plugins/src.ctf.fs/query/test_query_trace_info.py b/tests/plugins/src.ctf.fs/query/test_query_trace_info.py
index a63fe04f1f86ca14eb374157b1ba42617be24747..8d8cda783a58e7762fb61e478b44550d6436b25c 100644 (file)
--- a/tests/plugins/src.ctf.fs/query/test_query_trace_info.py
+++ b/tests/plugins/src.ctf.fs/query/test_query_trace_info.py
@@ -37,7 +37,7 @@ class QueryTraceInfoClockOffsetTestCase(unittest.TestCase):
         ctf = bt2.find_plugin('ctf')
         self._fs = ctf.source_component_classes['fs']
 
-        self._paths = [
+        self._inputs = [
             os.path.join(test_ctf_traces_path, 'intersection', '3eventsintersect')
         ]
         self._executor = bt2.QueryExecutor()
@@ -59,12 +59,14 @@ class QueryTraceInfoClockOffsetTestCase(unittest.TestCase):
         self.assertEqual(streams[1]['range-ns']['end'], 13515309000000120 + offset)
 
     # Test various cominations of the clock-class-offset-s and
-    # clock-class-offset-ns parameters to trace-info queries.
+    # clock-class-offset-ns parameters to babeltrace.trace-info queries.
 
     # Without clock class offset
 
     def test_no_clock_class_offset(self):
-        res = self._executor.query(self._fs, 'trace-info', {'paths': self._paths})
+        res = self._executor.query(
+            self._fs, 'babeltrace.trace-info', {'inputs': self._inputs}
+        )
         trace = res[0]
         self._check(trace, 0)
 
@@ -72,7 +74,9 @@ class QueryTraceInfoClockOffsetTestCase(unittest.TestCase):
 
     def test_clock_class_offset_s(self):
         res = self._executor.query(
-            self._fs, 'trace-info', {'paths': self._paths, 'clock-class-offset-s': 2}
+            self._fs,
+            'babeltrace.trace-info',
+            {'inputs': self._inputs, 'clock-class-offset-s': 2},
         )
         trace = res[0]
         self._check(trace, 2000000000)
@@ -81,7 +85,9 @@ class QueryTraceInfoClockOffsetTestCase(unittest.TestCase):
 
     def test_clock_class_offset_ns(self):
         res = self._executor.query(
-            self._fs, 'trace-info', {'paths': self._paths, 'clock-class-offset-ns': 2}
+            self._fs,
+            'babeltrace.trace-info',
+            {'inputs': self._inputs, 'clock-class-offset-ns': 2},
         )
         trace = res[0]
         self._check(trace, 2)
@@ -91,9 +97,9 @@ class QueryTraceInfoClockOffsetTestCase(unittest.TestCase):
     def test_clock_class_offset_both(self):
         res = self._executor.query(
             self._fs,
-            'trace-info',
+            'babeltrace.trace-info',
             {
-                'paths': self._paths,
+                'inputs': self._inputs,
                 'clock-class-offset-s': -2,
                 'clock-class-offset-ns': -2,
             },
@@ -102,35 +108,35 @@ class QueryTraceInfoClockOffsetTestCase(unittest.TestCase):
         self._check(trace, -2000000002)
 
     def test_clock_class_offset_s_wrong_type(self):
-        with self.assertRaises(bt2.InvalidParams):
+        with self.assertRaises(bt2._Error):
             self._executor.query(
                 self._fs,
-                'trace-info',
-                {'paths': self._paths, 'clock-class-offset-s': "2"},
+                'babeltrace.trace-info',
+                {'inputs': self._inputs, 'clock-class-offset-s': "2"},
             )
 
     def test_clock_class_offset_s_wrong_type_none(self):
-        with self.assertRaises(bt2.InvalidParams):
+        with self.assertRaises(bt2._Error):
             self._executor.query(
                 self._fs,
-                'trace-info',
-                {'paths': self._paths, 'clock-class-offset-s': None},
+                'babeltrace.trace-info',
+                {'inputs': self._inputs, 'clock-class-offset-s': None},
             )
 
     def test_clock_class_offset_ns_wrong_type(self):
-        with self.assertRaises(bt2.InvalidParams):
+        with self.assertRaises(bt2._Error):
             self._executor.query(
                 self._fs,
-                'trace-info',
-                {'paths': self._paths, 'clock-class-offset-ns': "2"},
+                'babeltrace.trace-info',
+                {'inputs': self._inputs, 'clock-class-offset-ns': "2"},
             )
 
     def test_clock_class_offset_ns_wrong_type_none(self):
-        with self.assertRaises(bt2.InvalidParams):
+        with self.assertRaises(bt2._Error):
             self._executor.query(
                 self._fs,
-                'trace-info',
-                {'paths': self._paths, 'clock-class-offset-ns': None},
+                'babeltrace.trace-info',
+                {'inputs': self._inputs, 'clock-class-offset-ns': None},
             )
 
 
@@ -144,9 +150,9 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase):
     def test_trace_uuid_stream_class_id_no_stream_id(self):
         res = self._executor.query(
             self._fs,
-            "trace-info",
+            "babeltrace.trace-info",
             {
-                "paths": [
+                "inputs": [
                     os.path.join(
                         test_ctf_traces_path, "intersection", "3eventsintersect"
                     )
@@ -180,8 +186,8 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase):
     def test_trace_uuid_no_stream_class_id_no_stream_id(self):
         res = self._executor.query(
             self._fs,
-            "trace-info",
-            {"paths": [os.path.join(test_ctf_traces_path, "succeed", "succeed1")]},
+            "babeltrace.trace-info",
+            {"inputs": [os.path.join(test_ctf_traces_path, "succeed", "succeed1")]},
         )
 
         os_stream_path = PurePosixPath(
@@ -210,14 +216,15 @@ class QueryTraceInfoRangeTestCase(unittest.TestCase):
         self._executor = bt2.QueryExecutor()
 
     def test_trace_no_range(self):
-        # This trace has no `timestamp_begin` and `timestamp_end` in its packet
-        # context. The `trace-info` query should omit the `range-ns` fields in
-        # the `trace` and `stream` data structures.
+        # This trace has no `timestamp_begin` and `timestamp_end` in its
+        # packet context. The `babeltrace.trace-info` query should omit
+        # the `range-ns` fields in the `trace` and `stream` data
+        # structures.
 
         res = self._executor.query(
             self._fs,
-            "trace-info",
-            {"paths": [os.path.join(test_ctf_traces_path, "succeed", "succeed1")]},
+            "babeltrace.trace-info",
+            {"inputs": [os.path.join(test_ctf_traces_path, "succeed", "succeed1")]},
         )
 
         self.assertEqual(len(res), 1)