From c3f3b36cd372aa9f0f8fc81ade1125ad81dc6077 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 22 Mar 2017 22:07:16 -0700 Subject: [PATCH] Removed some unnecessary comments; Updated changelog --- CHANGELOG.rst | 1 + tests/functional/openlp_plugins/remotes/test_router.py | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f9c95fdd7..7d65af424 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,3 +8,4 @@ OpenLP 2.4.6 * Fix opening the data folder (KDE thought the old way was an SMB share) * Fix a problem with the new QMediaPlayer not controlling the playlist anymore * Added importing of author types to the OpenLP 2 song importer +* Refactored the merge script and gave it some options diff --git a/tests/functional/openlp_plugins/remotes/test_router.py b/tests/functional/openlp_plugins/remotes/test_router.py index 529f576a2..c06e9b7e9 100644 --- a/tests/functional/openlp_plugins/remotes/test_router.py +++ b/tests/functional/openlp_plugins/remotes/test_router.py @@ -336,13 +336,9 @@ class TestRouter(TestCase, TestMixin): with patch.object(self.service_manager, 'setup_ui'), \ patch.object(self.router, 'do_json_header'): self.service_manager.bootstrap_initialise() - # Not sure why this is here, it doesn't make sense in the test and causes them to hang - # self.app.processEvents() # WHEN: Remote next is received self.router.service(action='next') - # Not sure why this is here, it doesn't make sense in the test and causes them to hang - # self.app.processEvents() # THEN: service_manager.next_item() should have been called self.assertTrue(mocked_next_item.called, 'next_item() should have been called in service_manager') @@ -359,13 +355,9 @@ class TestRouter(TestCase, TestMixin): with patch.object(self.service_manager, 'setup_ui'), \ patch.object(self.router, 'do_json_header'): self.service_manager.bootstrap_initialise() - # Not sure why this is here, it doesn't make sense in the test and causes them to hang - # self.app.processEvents() # WHEN: Remote next is received self.router.service(action='previous') - # Not sure why this is here, it doesn't make sense in the test and causes them to hang - # self.app.processEvents() # THEN: service_manager.next_item() should have been called self.assertTrue(mocked_previous_item.called, 'previous_item() should have been called in service_manager')