From be222ca597094f447eb80a193cf323f68a03a436 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 25 Nov 2015 22:47:56 +0100 Subject: [PATCH 1/2] Fix tests that fails on py35. --- tests/functional/openlp_core_ui/test_thememanager.py | 2 +- .../presentations/test_presentationcontroller.py | 10 ++++++++-- tests/functional/openlp_plugins/remotes/test_router.py | 10 ++++++---- tests/functional/openlp_plugins/songs/test_ewimport.py | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/functional/openlp_core_ui/test_thememanager.py b/tests/functional/openlp_core_ui/test_thememanager.py index 3dc168f77..908251ff8 100644 --- a/tests/functional/openlp_core_ui/test_thememanager.py +++ b/tests/functional/openlp_core_ui/test_thememanager.py @@ -240,4 +240,4 @@ class TestThemeManager(TestCase): theme_manager.unzip_theme('theme.file', 'folder') # THEN: The critical_error_message_box should have been called - mocked_critical_error_message_box.assert_called_once(ANY, ANY) + self.assertEqual(mocked_critical_error_message_box.call_count, 1, 'Should have been called once') diff --git a/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py b/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py index 739816147..77cfcae06 100644 --- a/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py @@ -49,11 +49,17 @@ class TestPresentationController(TestCase): # _get_plugin_manager def setUp(self): + self.get_thumbnail_folder_patcher = \ + patch('openlp.plugins.presentations.lib.presentationcontroller.PresentationDocument.get_thumbnail_folder') + self.get_thumbnail_folder_patcher.start() mocked_plugin = MagicMock() mocked_plugin.settings_section = 'presentations' self.presentation = PresentationController(mocked_plugin) self.document = PresentationDocument(self.presentation, '') + def tearDown(self): + self.get_thumbnail_folder_patcher.stop() + def constructor_test(self): """ Test the Constructor @@ -86,8 +92,8 @@ class TestPresentationController(TestCase): mocked_open.assert_any_call(os.path.join('test', 'slideNotes2.txt'), mode='wt', encoding='utf-8') self.assertEqual(mocked_open.call_count, 3, 'There should be exactly three files opened') mocked_open().writelines.assert_called_once_with(['uno', 'dos']) - mocked_open().write.assert_called_any('one') - mocked_open().write.assert_called_any('two') + mocked_open().write.assert_any_call('one') + mocked_open().write.assert_any_call('two') def save_titles_and_notes_with_None_test(self): """ diff --git a/tests/functional/openlp_plugins/remotes/test_router.py b/tests/functional/openlp_plugins/remotes/test_router.py index 70a2033a4..e62ee9c14 100644 --- a/tests/functional/openlp_plugins/remotes/test_router.py +++ b/tests/functional/openlp_plugins/remotes/test_router.py @@ -272,7 +272,6 @@ class TestRouter(TestCase, TestMixin): self.router.end_headers = MagicMock() self.router.wfile = MagicMock() mocked_image_manager = MagicMock() - Registry.create() Registry().register('image_manager', mocked_image_manager) file_name = 'another%20test/slide1.png' full_path = os.path.normpath(os.path.join('thumbnails', file_name)) @@ -295,9 +294,12 @@ class TestRouter(TestCase, TestMixin): self.assertEqual(self.router.end_headers.call_count, 1, 'end_headers called once') mocked_exists.assert_called_with(urllib.parse.unquote(full_path)) self.assertEqual(mocked_image_to_byte.call_count, 1, 'Called once') - mocked_image_manager.assert_called_any(os.path.normpath('thumbnails\\another test'), - 'slide1.png', None, '120x90') - mocked_image_manager.assert_called_any(os.path.normpath('thumbnails\\another test'), 'slide1.png', '120x90') + mocked_image_manager.add_image.assert_any_call(os.path.normpath(os.path.join('thumbnails', 'another test', + 'slide1.png')), + 'slide1.png', None, width, height) + mocked_image_manager.get_image.assert_any_call(os.path.normpath(os.path.join('thumbnails', 'another test', + 'slide1.png')), + 'slide1.png', width, height) def remote_next_test(self): """ diff --git a/tests/functional/openlp_plugins/songs/test_ewimport.py b/tests/functional/openlp_plugins/songs/test_ewimport.py index d41100444..7b78a4d85 100644 --- a/tests/functional/openlp_plugins/songs/test_ewimport.py +++ b/tests/functional/openlp_plugins/songs/test_ewimport.py @@ -403,7 +403,7 @@ class TestEasyWorshipSongImport(TestCase): # THEN: do_import should return None having called retrieve_windows_encoding with the correct encoding. self.assertIsNone(importer.do_import(), 'do_import should return None when db_size is less than 0x800') - mocked_retrieve_windows_encoding.assert_call(encoding) + mocked_retrieve_windows_encoding.assert_any_call(encoding) def db_file_import_test(self): """ From a5525e96c1b675436ebe7f1db8e1948c04652bad Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Thu, 26 Nov 2015 21:44:19 +0100 Subject: [PATCH 2/2] Fix projector tests. --- tests/functional/openlp_core_lib/test_projectordb.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/functional/openlp_core_lib/test_projectordb.py b/tests/functional/openlp_core_lib/test_projectordb.py index a96267fe9..bf6c1688e 100644 --- a/tests/functional/openlp_core_lib/test_projectordb.py +++ b/tests/functional/openlp_core_lib/test_projectordb.py @@ -94,6 +94,12 @@ class TestProjectorDB(TestCase): mocked_init_url.return_value = 'sqlite:///%s' % tmpfile self.projector = ProjectorDB() + def tearDown(self): + """ + Clean up + """ + self.projector = None + def find_record_by_ip_test(self): """ Test find record by IP