merge trunk

tests/functional/openlp_core_lib/test_projectordb.py

@@ -90,7 +90,6 @@ class TestProjectorDB(TestCase):
         """
         if not hasattr(self, 'projector'):
             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
                 self.projector = ProjectorDB()
 

tests/interfaces/openlp_core_ui/test_projectormanager.py

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

tests/interfaces/openlp_core_ui/test_projectorsourceform.py

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