forked from openlp/openlp
Fix projector test cleanups
This commit is contained in:
parent
81f6214cc5
commit
d914deacd2
@ -30,6 +30,7 @@
|
|||||||
Module-level functions for the functional test suite
|
Module-level functions for the functional test suite
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
from tests.interfaces import patch
|
from tests.interfaces import patch
|
||||||
|
|
||||||
from openlp.core.common import is_win
|
from openlp.core.common import is_win
|
||||||
@ -51,3 +52,9 @@ def tearDown():
|
|||||||
Ensure test suite has been cleaned up after tests
|
Ensure test suite has been cleaned up after tests
|
||||||
"""
|
"""
|
||||||
patch.stopall()
|
patch.stopall()
|
||||||
|
if not is_win():
|
||||||
|
try:
|
||||||
|
# In case of changed schema, remove old test file
|
||||||
|
os.remove(tmpfile)
|
||||||
|
except FileNotFoundError:
|
||||||
|
pass
|
||||||
|
@ -44,12 +44,6 @@ from tests.resources.projector.data import TEST1_DATA, TEST2_DATA, TEST3_DATA
|
|||||||
|
|
||||||
tmpfile = '/tmp/openlp-test-projectormanager.sql'
|
tmpfile = '/tmp/openlp-test-projectormanager.sql'
|
||||||
|
|
||||||
try:
|
|
||||||
# In case of changed schema, remove old test file
|
|
||||||
os.remove(tmpfile)
|
|
||||||
except FileNotFoundError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class TestProjectorManager(TestCase, TestMixin):
|
class TestProjectorManager(TestCase, TestMixin):
|
||||||
"""
|
"""
|
||||||
@ -72,8 +66,11 @@ class TestProjectorManager(TestCase, TestMixin):
|
|||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
"""
|
"""
|
||||||
Delete all the C++ objects at the end so that we don't have a segfault
|
Remove test database.
|
||||||
|
Delete all the C++ objects at the end so that we don't have a segfault.
|
||||||
"""
|
"""
|
||||||
|
self.projectordb.session.close()
|
||||||
|
del(self.projector_manager)
|
||||||
self.destroy_settings()
|
self.destroy_settings()
|
||||||
|
|
||||||
def bootstrap_initialise_test(self):
|
def bootstrap_initialise_test(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user