bt2: make bt2.Error wrap current thread's error

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

diff --git a/tests/bindings/python/bt2/test_plugin.py b/tests/bindings/python/bt2/test_plugin.py
index 2096d84b2301e49d88a00c0cab443fea05e5ed85..d7e0965b1f21c3d98b2ff0ccdf23b8df2663b38c 100644 (file)
--- a/tests/bindings/python/bt2/test_plugin.py
+++ b/tests/bindings/python/bt2/test_plugin.py
@@ -49,8 +49,10 @@ class PluginSetTestCase(unittest.TestCase):
 
 class FindPluginsTestCase(unittest.TestCase):
     def test_find_nonexistent_dir(self):
-        with self.assertRaises(bt2.Error):
-            bt2.find_plugins('/this/does/not/exist/246703df-cb85-46d5-8406-5e8dc4a88b41')
+        with self.assertRaises(ValueError):
+            bt2.find_plugins(
+                '/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)
@@ -61,7 +63,9 @@ class FindPluginsTestCase(unittest.TestCase):
         self.assertTrue(len(pset) >= 3)
 
     def test_find_file(self):
-        extension = _TEST_PLUGIN_PLUGIN_EXTENSION_BY_OS.get(os.environ['BT_OS_TYPE'], 'so')
+        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(path)
@@ -70,7 +74,9 @@ class FindPluginsTestCase(unittest.TestCase):
 
 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):
@@ -89,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):