diff options
| author | Mathieu Duponchelle <mathieu.duponchelle@opencreed.com> | 2015-04-26 17:59:04 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2015-07-17 15:27:05 +0200 |
| commit | b45e74074304e09a4323cc21c631fa0028ce23c8 (patch) | |
| tree | b6a52ca5454cfa530801189fc3dbf3b76a39041c | |
| parent | 888622339e1dffcb68959f00beb75166c4909fa5 (diff) | |
| download | grilo-b45e74074304e09a4323cc21c631fa0028ce23c8.tar.gz | |
tests: Fix loading plugins
https://bugzilla.gnome.org/show_bug.cgi?id=748455
| -rw-r--r-- | tests/python/test_fs.py | 5 | ||||
| -rw-r--r-- | tests/python/test_media.py | 5 | ||||
| -rw-r--r-- | tests/python/test_options.py | 5 | ||||
| -rw-r--r-- | tests/python/test_plugin.py | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/tests/python/test_fs.py b/tests/python/test_fs.py index 3a37140..1f44b55 100644 --- a/tests/python/test_fs.py +++ b/tests/python/test_fs.py @@ -261,6 +261,9 @@ def _init(): fs_config.set_string("base-path", _tempdir) registry.add_config(fs_config) - registry.load_by_id("grl-filesystem") + try: + registry.load_plugin_by_id("grl-filesystem") + except GLib.Error: + pass _init() diff --git a/tests/python/test_media.py b/tests/python/test_media.py index 1532636..d00960b 100644 --- a/tests/python/test_media.py +++ b/tests/python/test_media.py @@ -56,4 +56,7 @@ class TestMedia(unittest.TestCase): # who said "this is ugly" ? Grl.init([]) registry = Grl.Registry.get_default() -registry.load_by_id("grl-filesystem") +try: + registry.load_plugin_by_id("grl-filesystem") +except GLib.Error: + pass diff --git a/tests/python/test_options.py b/tests/python/test_options.py index 5a8f1c5..fe63fdb 100644 --- a/tests/python/test_options.py +++ b/tests/python/test_options.py @@ -190,4 +190,7 @@ class TestFileSystem(unittest.TestCase): # who said "this is ugly" ? Grl.init([]) registry = Grl.Registry.get_default() -registry.load_by_id("grl-filesystem") +try: + registry.load_plugin_by_id("grl-filesystem") +except GLib.Error: + pass diff --git a/tests/python/test_plugin.py b/tests/python/test_plugin.py index 68b1437..fc9648b 100644 --- a/tests/python/test_plugin.py +++ b/tests/python/test_plugin.py @@ -15,7 +15,7 @@ class TestMediaPlugin(unittest.TestCase): super(TestMediaPlugin, self).__init__(method_name) Grl.init([]) self.registry = Grl.Registry.get_default() - self.registry.load_all() + self.registry.load_all_plugins() sources = self.registry.get_sources(False) if sources: self.plugin = sources[0] |