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

Another attempt to fix projector test across platforms and versions

Browse Source
This commit is contained in:
Tomas Groth 2014-11-28 10:53:39 +00:00
parent 612041dafa
commit 6af0aef8bd
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/functional/openlp_core_lib/test_projectordb.py
View File

@ -85,8 +85,11 @@ class TestProjectorDB(TestCase):
Set up anything necessary for all tests Set up anything necessary for all tests
""" """
if not hasattr(self, 'projector'): if not hasattr(self, 'projector'):
with patch('openlp.core.lib.db.init_url') as mocked_init_url: # We need to patch this twice to make it work across multiple platforms and versions.
mocked_init_url.return_value = 'sqlite:///%s' % tmpfile with patch('openlp.core.lib.db.init_url') as mocked_init_url1, \
patch('openlp.core.lib.projector.db.init_url') as mocked_init_url2:
mocked_init_url1.return_value = 'sqlite:///%s' % tmpfile
mocked_init_url2.return_value = 'sqlite:///%s' % tmpfile
self.projector = ProjectorDB() self.projector = ProjectorDB()
def find_record_by_ip_test(self): def find_record_by_ip_test(self):

7
tests/interfaces/openlp_core_ui/test_projectormanager.py
View File

@ -57,8 +57,11 @@ class TestProjectorManager(TestCase, TestMixin):
self.setup_application() self.setup_application()
Registry.create() Registry.create()
if not hasattr(self, 'projector_manager'): if not hasattr(self, 'projector_manager'):
with patch('openlp.core.lib.db.init_url') as mocked_init_url: # We need to patch this twice to make it work across multiple platforms and versions.
mocked_init_url.return_value = 'sqlite:///%s' % tmpfile with patch('openlp.core.lib.db.init_url') as mocked_init_url1, \
patch('openlp.core.lib.projector.db.init_url') as mocked_init_url2:
mocked_init_url1.return_value = 'sqlite:///%s' % tmpfile
mocked_init_url2.return_value = 'sqlite:///%s' % tmpfile
self.projectordb = ProjectorDB() self.projectordb = ProjectorDB()
if not hasattr(self, 'projector_manager'): if not hasattr(self, 'projector_manager'):
self.projector_manager = ProjectorManager(projectordb=self.projectordb) self.projector_manager = ProjectorManager(projectordb=self.projectordb)