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

Fix the tests on Windows too

Browse Source
This commit is contained in:
Tomas Groth 2016-01-07 23:57:01 +02:00 committed by Raoul Snyman
parent 7853706479
commit a61430a59f
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,7 @@ class TestProjectorDB(TestCase):
""" """
Clean up Clean up
""" """
self.projector.session.close()
self.projector = None self.projector = None
def find_record_by_ip_test(self): def find_record_by_ip_test(self):

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

@ -22,7 +22,6 @@
""" """
Interface tests to test the themeManager class and related methods. Interface tests to test the themeManager class and related methods.
""" """
import os import os
from unittest import TestCase from unittest import TestCase
@ -33,9 +32,7 @@ from tests.helpers.testmixin import TestMixin
from openlp.core.ui import ProjectorManager, ProjectorEditForm from openlp.core.ui import ProjectorManager, ProjectorEditForm
from openlp.core.lib.projector.db import Projector, ProjectorDB from openlp.core.lib.projector.db import Projector, ProjectorDB
from tests.resources.projector.data import TEST1_DATA, TEST2_DATA, TEST3_DATA from tests.resources.projector.data import TEST_DB, TEST1_DATA, TEST2_DATA, TEST3_DATA
tmpfile = '/tmp/openlp-test-projectormanager.sql'
class TestProjectorManager(TestCase, TestMixin): class TestProjectorManager(TestCase, TestMixin):
@ -49,9 +46,10 @@ class TestProjectorManager(TestCase, TestMixin):
self.build_settings() self.build_settings()
self.setup_application() self.setup_application()
Registry.create() Registry.create()
if not hasattr(self, 'projector_manager'):
with patch('openlp.core.lib.projector.db.init_url') as mocked_init_url: with patch('openlp.core.lib.projector.db.init_url') as mocked_init_url:
mocked_init_url.return_value = 'sqlite:///%s' % tmpfile if os.path.exists(TEST_DB):
os.unlink(TEST_DB)
mocked_init_url.return_value = 'sqlite:///%s' % TEST_DB
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)