cli: handle leftovers in the same loop as components

[babeltrace.git] / tests / data / cli / auto-source-discovery / bt_plugin_test.py

diff --git a/tests/data/cli/auto-source-discovery/bt_plugin_test.py b/tests/data/cli/auto-source-discovery/bt_plugin_test.py
index 002e9c33e3474c82a41c7251f9ff1431069a6f26..4d6e86e2da8e20c97c2fbab845324ad4b6d54b54 100644 (file)
--- a/tests/data/cli/auto-source-discovery/bt_plugin_test.py
+++ b/tests/data/cli/auto-source-discovery/bt_plugin_test.py
@@ -26,8 +26,8 @@ class TestSourceExt(Base, bt2._UserSourceComponent, message_iterator_class=TestI
         self._print_params(params)
 
     @staticmethod
-    def _user_query(query_exec, obj, params, log_level):
-        if obj == 'support-info':
+    def _user_query(priv_query_exec, obj, params):
+        if obj == 'babeltrace.support-info':
             if params['type'] == 'file':
                 name = os.path.basename(str(params['input']))
 
@@ -49,7 +49,7 @@ class TestSourceExt(Base, bt2._UserSourceComponent, message_iterator_class=TestI
             else:
                 return 0
         else:
-            raise bt2.InvalidObject
+            raise bt2.UnknownObject
 
 
 @bt2.plugin_component_class
@@ -64,15 +64,15 @@ class TestSourceSomeDir(
         self._print_params(params)
 
     @staticmethod
-    def _user_query(query_exec, obj, params, log_level):
-        if obj == 'support-info':
+    def _user_query(priv_query_exec, obj, params):
+        if obj == 'babeltrace.support-info':
             if params['type'] == 'directory':
                 name = os.path.basename(str(params['input']))
                 return 1 if name == 'some-dir' else 0
             else:
                 return 0
         else:
-            raise bt2.InvalidObject
+            raise bt2.UnknownObject
 
 
 @bt2.plugin_component_class
@@ -83,15 +83,15 @@ class TestSourceABCDE(Base, bt2._UserSourceComponent, message_iterator_class=Tes
         self._print_params(params)
 
     @staticmethod
-    def _user_query(query_exec, obj, params, log_level):
-        if obj == 'support-info':
+    def _user_query(priv_query_exec, obj, params):
+        if obj == 'babeltrace.support-info':
             return (
                 1.0
                 if params['type'] == 'string' and params['input'] == 'ABCDE'
                 else 0.0
             )
         else:
-            raise bt2.InvalidObject
+            raise bt2.UnknownObject
 
 
 class TestSourceNoQuery(bt2._UserSourceComponent, message_iterator_class=TestIter):