raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed image test

This commit is contained in:
Tomas Groth 2014-07-11 14:43:40 +02:00
parent 4920f86351
commit 9d64837602
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/functional/openlp_core_lib/test_image_manager.py
View File

@ -90,7 +90,6 @@ class TestImageManager(TestCase, TestMixin):
self.image_manager.get_image(TEST_PATH, 'church1.jpg') self.image_manager.get_image(TEST_PATH, 'church1.jpg')
self.assertNotEquals(context.exception, '', 'KeyError exception should have been thrown for missing image') self.assertNotEquals(context.exception, '', 'KeyError exception should have been thrown for missing image')
<<<<<<< TREE
def different_dimension_image_test(self): def different_dimension_image_test(self):
""" """
Test the Image Manager with dimensions Test the Image Manager with dimensions
@ -124,7 +123,6 @@ class TestImageManager(TestCase, TestMixin):
self.image_manager.get_image(full_path, 'church.jpg', '120x120') self.image_manager.get_image(full_path, 'church.jpg', '120x120')
self.assertNotEquals(context.exception, '', 'KeyError exception should have been thrown for missing dimension') self.assertNotEquals(context.exception, '', 'KeyError exception should have been thrown for missing dimension')
=======
def process_cache_test(self): def process_cache_test(self):
""" """
Test the process_cache method Test the process_cache method
@ -187,7 +185,7 @@ class TestImageManager(TestCase, TestMixin):
:param image: The name of the image. E. g. ``image1`` :param image: The name of the image. E. g. ``image1``
""" """
return self.image_manager._cache[(TEST_PATH, image)].priority return self.image_manager._cache[(TEST_PATH, image, '')].priority
def mocked_resize_image(self, *args): def mocked_resize_image(self, *args):
""" """