X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_plugin.py;h=80de97a3091c201321f73481172a6539c14fa817;hp=d7e0965b1f21c3d98b2ff0ccdf23b8df2663b38c;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=ce4923b0c7a2de36eba95725334d251e9aa08aad

diff --git a/tests/bindings/python/bt2/test_plugin.py b/tests/bindings/python/bt2/test_plugin.py
index d7e0965b..80de97a3 100644
--- a/tests/bindings/python/bt2/test_plugin.py
+++ b/tests/bindings/python/bt2/test_plugin.py
@@ -1,24 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Copyright (C) 2019 EfficiOS Inc.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; only version 2
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
 
 import unittest
 import bt2
-import bt2.plugin
 import os
 
 
@@ -28,15 +14,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:
@@ -50,16 +36,16 @@ class PluginSetTestCase(unittest.TestCase):
 class FindPluginsTestCase(unittest.TestCase):
     def test_find_nonexistent_dir(self):
         with self.assertRaises(ValueError):
-            bt2.find_plugins(
+            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 +54,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,13 +66,15 @@ class FindPluginTestCase(unittest.TestCase):
         self.assertIsNone(plugin)
 
     def test_find_existing(self):
-        plugin = bt2.find_plugin('ctf')
-        self.assertIsInstance(plugin, bt2.plugin._Plugin)
+        plugin = bt2.find_plugin('ctf', find_in_user_dir=False, find_in_sys_dir=False)
+        self.assertIsNotNone(plugin)
 
 
 class PluginTestCase(unittest.TestCase):
     def setUp(self):
-        self._plugin = bt2.find_plugin('ctf')
+        self._plugin = bt2.find_plugin(
+            'ctf', find_in_user_dir=False, find_in_sys_dir=False
+        )
 
     def tearDown(self):
         del self._plugin
@@ -100,13 +88,13 @@ class PluginTestCase(unittest.TestCase):
         self.assertTrue(plugin_path.startswith(plugin_path_env))
 
     def test_author(self):
-        self.assertTrue('Philippe Proulx' in self._plugin.author)
+        self.assertEqual(self._plugin.author, 'EfficiOS <https://www.efficios.com/>')
 
     def test_license(self):
-        self.assertTrue('MIT' in self._plugin.license)
+        self.assertEqual(self._plugin.license, 'MIT')
 
     def test_description(self):
-        self.assertTrue('CTF source and sink support' in self._plugin.description)
+        self.assertEqual(self._plugin.description, 'CTF input and output')
 
     def test_version(self):
         self.assertIsNone(self._plugin.version)
@@ -133,8 +121,12 @@ class PluginTestCase(unittest.TestCase):
         self.assertEqual(plugins['lttng-live'].name, 'lttng-live')
 
     def test_filter_comp_classes_len(self):
-        plugin = bt2.find_plugin('utils')
+        plugin = bt2.find_plugin('utils', find_in_user_dir=False, find_in_sys_dir=False)
         self.assertEqual(len(plugin.filter_component_classes), 2)
 
     def test_sink_comp_classes_len(self):
         self.assertEqual(len(self._plugin.sink_component_classes), 1)
+
+
+if __name__ == '__main__':
+    unittest.main()