diff options
author | Guillaume Emont <guijemont@igalia.com> | 2011-05-04 18:39:26 +0200 |
---|---|---|
committer | Guillaume Emont <guijemont@igalia.com> | 2011-05-16 11:54:41 +0200 |
commit | 82249d2217ac2e730a08620a8b2b2a665329ce1e (patch) | |
tree | 84a25a961ad08c7e1d19ed60e0ce61919e74399c /tests | |
parent | 2b237de289b24124d5786b663b44eb1ddd44f291 (diff) | |
download | grilo-82249d2217ac2e730a08620a8b2b2a665329ce1e.tar.gz |
tests: updated test_registry.py for consistency with current behaviour
Diffstat (limited to 'tests')
-rw-r--r-- | tests/python/test_registry.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/python/test_registry.py b/tests/python/test_registry.py index 06b072f..654a2fa 100644 --- a/tests/python/test_registry.py +++ b/tests/python/test_registry.py @@ -4,6 +4,7 @@ import util import tempfile import logging import constants +import glib try: from gi.repository import Grl @@ -54,20 +55,20 @@ class TestPluginRegistry(unittest.TestCase): pass def test_load_existing(self): + # skipping since this is likely to have been loaded by another test + return None + if not self.registry.load(self.EXISTING_LIBRARY_PATH): self.fail() def test_load_unexisting(self): - if self.registry.load(self.NONEXISTING_LIBRARY_PATH): - self.fail() + self.assertRaises(glib.GError, self.registry.load, self.NONEXISTING_LIBRARY_PATH) def test_load_invalid(self): - if self.registry.load(self.INVALID_LIBRARY_PATH): - self.fail() + self.assertRaises(glib.GError, self.registry.load, self.INVALID_LIBRARY_PATH) def test_load_directory_nonexisting(self): - if self.registry.load_directory(''): - self.fail() + self.assertRaises(glib.GError, self.registry.load_directory, '') def test_load_directory_existing(self): if not self.registry.load_directory(os.getcwd()): @@ -140,7 +141,7 @@ class TestPluginRegistry(unittest.TestCase): def test_lookup_metadata_key_nonexisting_key(self): nonexisting_key = self.registry.lookup_metadata_key(constants.KEY_NONEXISTING) - self.assertTrue(nonexisting_key is None) + self.assertTrue(nonexisting_key == Grl.METADATA_KEY_INVALID) def test_lookup_metadata_key_singleton(self): a_key = self.registry.lookup_metadata_key(constants.KEY_ID) |