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

Fix some tests that were causing issues

This commit is contained in:
Raoul Snyman 2017-03-02 11:54:18 -07:00
parent 2748f1e6c5
commit 090de0d987
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,11 +25,11 @@ This module contains tests for the lib submodule of the Remotes plugin.
import os import os
import urllib.request import urllib.request
from unittest import TestCase from unittest import TestCase
from unittest.mock import MagicMock, patch, mock_open
from openlp.core.common import Settings, Registry from openlp.core.common import Settings, Registry
from openlp.core.ui import ServiceManager from openlp.core.ui import ServiceManager
from openlp.plugins.remotes.lib.httpserver import HttpRouter from openlp.plugins.remotes.lib.httpserver import HttpRouter
from tests.functional import MagicMock, patch, mock_open
from tests.helpers.testmixin import TestMixin from tests.helpers.testmixin import TestMixin
__default_settings__ = { __default_settings__ = {
@ -313,11 +313,13 @@ 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()
self.app.processEvents() # Not sure why this is here, it doesn't make sense in the test
# self.app.processEvents()
# WHEN: Remote next is received # WHEN: Remote next is received
self.router.service(action='next') self.router.service(action='next')
self.app.processEvents() # Not sure why this is here, it doesn't make sense in the test
# 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')
@ -334,11 +336,13 @@ 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()
self.app.processEvents() # Not sure why this is here, it doesn't make sense in the test
# self.app.processEvents()
# WHEN: Remote next is received # WHEN: Remote next is received
self.router.service(action='previous') self.router.service(action='previous')
self.app.processEvents() # Not sure why this is here, it doesn't make sense in the test
# 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')

14
tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py
View File

@ -22,7 +22,7 @@
""" """
Package to test the openlp.plugins.bibles.forms.bibleimportform package. Package to test the openlp.plugins.bibles.forms.bibleimportform package.
""" """
from unittest import TestCase from unittest import TestCase, skip
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
@ -48,12 +48,12 @@ class TestBibleImportForm(TestCase, TestMixin):
Registry().register('main_window', self.main_window) Registry().register('main_window', self.main_window)
self.form = BibleImportForm(self.main_window, MagicMock(), MagicMock()) self.form = BibleImportForm(self.main_window, MagicMock(), MagicMock())
def tearDown(self): # def tearDown(self):
""" # """
Delete all the C++ objects at the end so that we don't have a segfault # Delete all the C++ objects at the end so that we don't have a segfault
""" # """
del self.form # del self.form
del self.main_window # del self.main_window
@patch('openlp.plugins.bibles.forms.bibleimportform.CWExtract.get_bibles_from_http') @patch('openlp.plugins.bibles.forms.bibleimportform.CWExtract.get_bibles_from_http')
@patch('openlp.plugins.bibles.forms.bibleimportform.BGExtract.get_bibles_from_http') @patch('openlp.plugins.bibles.forms.bibleimportform.BGExtract.get_bibles_from_http')