merge trunk

This commit is contained in:
Jonathan Springer 2015-12-01 17:07:00 -05:00
commit 6b35a99775
3 changed files with 0 additions and 3 deletions

View File

@ -90,7 +90,6 @@ class TestProjectorDB(TestCase):
""" """
if not hasattr(self, 'projector'): if not hasattr(self, 'projector'):
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.start()
mocked_init_url.return_value = 'sqlite:///%s' % tmpfile mocked_init_url.return_value = 'sqlite:///%s' % tmpfile
self.projector = ProjectorDB() self.projector = ProjectorDB()

View File

@ -51,7 +51,6 @@ class TestProjectorManager(TestCase, TestMixin):
Registry.create() Registry.create()
if not hasattr(self, 'projector_manager'): 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.start()
mocked_init_url.return_value = 'sqlite:///%s' % tmpfile mocked_init_url.return_value = 'sqlite:///%s' % tmpfile
self.projectordb = ProjectorDB() self.projectordb = ProjectorDB()
if not hasattr(self, 'projector_manager'): if not hasattr(self, 'projector_manager'):

View File

@ -65,7 +65,6 @@ class ProjectorSourceFormTest(TestCase, TestMixin):
""" """
Set up anything necessary for all tests Set up anything necessary for all tests
""" """
mocked_init_url.start()
mocked_init_url.return_value = 'sqlite:///{}'.format(tmpfile) mocked_init_url.return_value = 'sqlite:///{}'.format(tmpfile)
self.build_settings() self.build_settings()
self.setup_application() self.setup_application()