X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_plugin.py;h=68400ccbe7e2d4169eb25998502e54f68d3e73b3;hb=577fa92f184fd2d75fb0697e879ab563de117c2e;hp=9ba6cd9a197a263e82ec9f68056f41c604225368;hpb=824cfbd81e2eb6594a6c83e4dd25f53aff36f759;p=babeltrace.git

diff --git a/tests/bindings/python/bt2/test_plugin.py b/tests/bindings/python/bt2/test_plugin.py
index 9ba6cd9a..68400ccb 100644
--- a/tests/bindings/python/bt2/test_plugin.py
+++ b/tests/bindings/python/bt2/test_plugin.py
@@ -28,15 +28,15 @@ _TEST_PLUGIN_PLUGIN_EXTENSION_BY_OS = {'cygwin': 'dll', 'mingw': 'dll'}
 
 class PluginSetTestCase(unittest.TestCase):
     def test_create(self):
-        pset = bt2.find_plugins(_TEST_PLUGIN_PLUGINS_PATH)
+        pset = bt2.find_plugins_in_path(_TEST_PLUGIN_PLUGINS_PATH)
         self.assertTrue(len(pset) >= 3)
 
     def test_getitem(self):
-        pset = bt2.find_plugins(_TEST_PLUGIN_PLUGINS_PATH)
+        pset = bt2.find_plugins_in_path(_TEST_PLUGIN_PLUGINS_PATH)
         self.assertTrue(pset[0].path.startswith(_TEST_PLUGIN_PLUGINS_PATH))
 
     def test_iter(self):
-        pset = bt2.find_plugins(_TEST_PLUGIN_PLUGINS_PATH)
+        pset = bt2.find_plugins_in_path(_TEST_PLUGIN_PLUGINS_PATH)
         names = set()
 
         for plugin in pset:
@@ -49,17 +49,17 @@ class PluginSetTestCase(unittest.TestCase):
 
 class FindPluginsTestCase(unittest.TestCase):
     def test_find_nonexistent_dir(self):
-        with self.assertRaises(bt2.Error):
-            bt2.find_plugins(
+        with self.assertRaises(ValueError):
+            bt2.find_plugins_in_path(
                 '/this/does/not/exist/246703df-cb85-46d5-8406-5e8dc4a88b41'
             )
 
     def test_find_none_existing_dir(self):
-        plugins = bt2.find_plugins(_TEST_PLUGIN_PLUGINS_PATH, recurse=False)
+        plugins = bt2.find_plugins_in_path(_TEST_PLUGIN_PLUGINS_PATH, recurse=False)
         self.assertIsNone(plugins)
 
     def test_find_dir(self):
-        pset = bt2.find_plugins(_TEST_PLUGIN_PLUGINS_PATH)
+        pset = bt2.find_plugins_in_path(_TEST_PLUGIN_PLUGINS_PATH)
         self.assertTrue(len(pset) >= 3)
 
     def test_find_file(self):
@@ -68,7 +68,7 @@ class FindPluginsTestCase(unittest.TestCase):
         )
         plugin_name = 'babeltrace-plugin-utils.{}'.format(extension)
         path = os.path.join(_TEST_PLUGIN_PLUGINS_PATH, 'utils', '.libs', plugin_name)
-        pset = bt2.find_plugins(path)
+        pset = bt2.find_plugins_in_path(path)
         self.assertTrue(len(pset) == 1)
 
 
@@ -80,7 +80,7 @@ class FindPluginTestCase(unittest.TestCase):
         self.assertIsNone(plugin)
 
     def test_find_existing(self):
-        plugin = bt2.find_plugin('ctf')
+        plugin = bt2.find_plugin('ctf', find_in_user_dir=False, find_in_sys_dir=False)
         self.assertIsInstance(plugin, bt2.plugin._Plugin)