Wait for threads on exit.

Move the fixups that were in renderings tests to QgsApplication::exitQgis
qgis · Sep 11, 2019 · fb832d2 · fb832d2
1 parent cf642be
commit fb832d2
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -1233,6 +1233,9 @@ QgsAuthManager *QgsApplication::authManager()
 
 void QgsApplication::exitQgis()
 {
+  // make sure all threads are done before exiting
+  QThreadPool::globalInstance()->waitForDone();
+
   // don't create to delete
   if ( instance() )
     delete instance()->mAuthManager;

diff --git a/tests/src/python/test_qgsmaprenderer.py b/tests/src/python/test_qgsmaprenderer.py
@@ -40,10 +40,6 @@ class TestQgsMapRenderer(unittest.TestCase):
     def setUp(self):
         pass
 
-    def tearDown(self):
-        # avoid crash on finish, probably related to https://bugreports.qt.io/browse/QTBUG-35760
-        QThreadPool.globalInstance().waitForDone()
-
     def checkRendererUseCachedLabels(self, job_type):
         layer = QgsVectorLayer("Point?field=fldtxt:string",
                                "layer1", "memory")

diff --git a/tests/src/python/test_qgspallabeling_canvas.py b/tests/src/python/test_qgspallabeling_canvas.py
@@ -51,8 +51,6 @@ def tearDownClass(cls):
         TestQgsPalLabeling.tearDownClass()
         cls.removeMapLayer(cls.layer)
         cls.layer = None
-        # avoid crash on finish, probably related to https://bugreports.qt.io/browse/QTBUG-35760
-        QThreadPool.globalInstance().waitForDone()
 
     def setUp(self):
         """Run before each test."""

diff --git a/tests/src/python/test_qgspallabeling_layout.py b/tests/src/python/test_qgspallabeling_layout.py
@@ -95,8 +95,6 @@ def tearDownClass(cls):
         TestQgsPalLabeling.tearDownClass()
         cls.removeMapLayer(cls.layer)
         cls.layer = None
-        # avoid crash on finish, probably related to https://bugreports.qt.io/browse/QTBUG-35760
-        QThreadPool.globalInstance().waitForDone()
 
     def setUp(self):
         """Run before each test."""

diff --git a/tests/src/python/test_qgspallabeling_placement.py b/tests/src/python/test_qgspallabeling_placement.py
@@ -43,8 +43,6 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         TestQgsPalLabeling.tearDownClass()
-        # avoid crash on finish, probably related to https://bugreports.qt.io/browse/QTBUG-35760
-        QThreadPool.globalInstance().waitForDone()
 
     def setUp(self):
         """Run before each test."""

diff --git a/tests/src/python/test_qgspointdisplacementrenderer.py b/tests/src/python/test_qgspointdisplacementrenderer.py
@@ -97,11 +97,6 @@ def _tearDown(self, layer):
         #QgsProject.instance().removeAllMapLayers()
         QgsProject.instance().removeMapLayer(layer)
 
-    @classmethod
-    def tearDownClass(cls):
-        # avoid crash on finish, probably related to https://bugreports.qt.io/browse/QTBUG-35760
-        QThreadPool.globalInstance().waitForDone()
-
     def _setProperties(self, r):
         """ set properties for a renderer for testing with _checkProperties"""
         r.setLabelAttributeName('name')