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

diff --git a/tests/bindings/python/bt2/test_plugin.py b/tests/bindings/python/bt2/test_plugin.py
index 4df92d07..68400ccb 100644
--- a/tests/bindings/python/bt2/test_plugin.py
+++ b/tests/bindings/python/bt2/test_plugin.py
@@ -22,20 +22,21 @@ import bt2.plugin
 import os
 
 
-_TEST_PLUGIN_PLUGINS_PATH = os.environ['TEST_PLUGIN_PLUGINS_PATH']
+_TEST_PLUGIN_PLUGINS_PATH = os.environ['BT_PLUGINS_PATH']
+_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:
@@ -47,27 +48,39 @@ class PluginSetTestCase(unittest.TestCase):
 
 
 class FindPluginsTestCase(unittest.TestCase):
-    def test_find_none(self):
-        pset = bt2.find_plugins('/this/does/not/exist/246703df-cb85-46d5-8406-5e8dc4a88b41')
-        self.assertIsNone(pset)
+    def test_find_nonexistent_dir(self):
+        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_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):
-        path = os.path.join(_TEST_PLUGIN_PLUGINS_PATH, 'utils', '.libs', 'babeltrace-plugin-utils.so')
-        pset = bt2.find_plugins(path)
+        extension = _TEST_PLUGIN_PLUGIN_EXTENSION_BY_OS.get(
+            os.environ['BT_OS_TYPE'], 'so'
+        )
+        plugin_name = 'babeltrace-plugin-utils.{}'.format(extension)
+        path = os.path.join(_TEST_PLUGIN_PLUGINS_PATH, 'utils', '.libs', plugin_name)
+        pset = bt2.find_plugins_in_path(path)
         self.assertTrue(len(pset) == 1)
 
 
 class FindPluginTestCase(unittest.TestCase):
     def test_find_none(self):
-        plugin = bt2.find_plugin('this-does-not-exist-246703df-cb85-46d5-8406-5e8dc4a88b41')
+        plugin = bt2.find_plugin(
+            'this-does-not-exist-246703df-cb85-46d5-8406-5e8dc4a88b41'
+        )
         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)
 
 
@@ -82,8 +95,8 @@ class PluginTestCase(unittest.TestCase):
         self.assertEqual(self._plugin.name, 'ctf')
 
     def test_path(self):
-        plugin_path = os.path.normcase(self._plugin.path)
-        plugin_path_env = os.path.normcase(_TEST_PLUGIN_PLUGINS_PATH)
+        plugin_path = os.path.abspath(os.path.normcase(self._plugin.path))
+        plugin_path_env = os.path.abspath(os.path.normcase(_TEST_PLUGIN_PLUGINS_PATH))
         self.assertTrue(plugin_path.startswith(plugin_path_env))
 
     def test_author(self):