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

Removed some unnecessary comments; Updated changelog

Browse Source
This commit is contained in:
Raoul Snyman 2017-03-22 22:07:16 -07:00
parent a2a51b95dd
commit c3f3b36cd3
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@ -8,3 +8,4 @@ OpenLP 2.4.6
* Fix opening the data folder (KDE thought the old way was an SMB share) * 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 * Fix a problem with the new QMediaPlayer not controlling the playlist anymore
* Added importing of author types to the OpenLP 2 song importer * Added importing of author types to the OpenLP 2 song importer
* Refactored the merge script and gave it some options

8
tests/functional/openlp_plugins/remotes/test_router.py
View File

@ -336,13 +336,9 @@ class TestRouter(TestCase, TestMixin):
with patch.object(self.service_manager, 'setup_ui'), \ with patch.object(self.service_manager, 'setup_ui'), \
patch.object(self.router, 'do_json_header'): patch.object(self.router, 'do_json_header'):
self.service_manager.bootstrap_initialise() 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 # WHEN: Remote next is received
self.router.service(action='next') 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 # THEN: service_manager.next_item() should have been called
self.assertTrue(mocked_next_item.called, 'next_item() should have been called in service_manager') 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'), \ with patch.object(self.service_manager, 'setup_ui'), \
patch.object(self.router, 'do_json_header'): patch.object(self.router, 'do_json_header'):
self.service_manager.bootstrap_initialise() 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 # WHEN: Remote next is received
self.router.service(action='previous') 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 # THEN: service_manager.next_item() should have been called
self.assertTrue(mocked_previous_item.called, 'previous_item() should have been called in service_manager') self.assertTrue(mocked_previous_item.called, 'previous_item() should have been called in service_manager')