Harden taskmanager tests

By using local variables and functions interdependency of the tests is decreased
qgis · Oct 31, 2017 · 87643e9 · 87643e9
1 parent 5000f9a
commit 87643e9
Showing 1 changed file with 48 additions and 32 deletions.
diff --git a/tests/src/python/test_qgstaskmanager.py b/tests/src/python/test_qgstaskmanager.py
@@ -58,42 +58,18 @@ def run_no_result(task):
     return
 
 
-def finished_no_val(e):
-    assert e is None
-    finished_no_val.called = True
-    return
-
-
 def run_fail(task):
     raise Exception('fail')
 
 
-def finished_fail(e):
-    assert e
-    finished_fail.finished_exception = e
-
-
 def run_single_val_result(task):
     return 5
 
 
-def finished_single_value_result(e, value):
-    assert e is None
-    finished_single_value_result.value = value
-    return
-
-
 def run_multiple_val_result(task):
     return 5, 'whoo'
 
 
-def finished_multiple_value_result(e, results):
-    assert e is None
-    finished_multiple_value_result.value = results[0]
-    finished_multiple_value_result.statement = results[1]
-    return
-
-
 class TestQgsTaskManager(unittest.TestCase):
 
     def testTaskFromFunction(self):
@@ -174,6 +150,14 @@ def testTaskFromFunctionCanSetProgress(self):
 
     def testTaskFromFunctionFinished(self):
         """ test that task from function can have callback finished function"""
+        called = False
+
+        def finished_no_val(e):
+            nonlocal called
+            assert e is None
+            called = True
+            return
+
         task = QgsTask.fromFunction('test task', run_no_result, on_finished=finished_no_val)
         QgsApplication.taskManager().addTask(task)
         while task.status() not in [QgsTask.Complete, QgsTask.Terminated]:
@@ -184,10 +168,17 @@ def testTaskFromFunctionFinished(self):
         # check that the finished function was called
         self.assertFalse(task.returned_values)
         self.assertFalse(task.exception)
-        self.assertTrue(finished_no_val.called)
+        self.assertTrue(called)
 
     def testTaskFromFunctionFinishedFail(self):
         """ test that task from function which fails calls finished with exception"""
+        finished_exception = None
+
+        def finished_fail(e):
+            nonlocal finished_exception
+            assert e
+            finished_exception = e
+
         task = QgsTask.fromFunction('test task', run_fail, on_finished=finished_fail)
         QgsApplication.taskManager().addTask(task)
         while task.status() not in [QgsTask.Complete, QgsTask.Terminated]:
@@ -197,11 +188,18 @@ def testTaskFromFunctionFinishedFail(self):
 
         # check that the finished function was called
         self.assertTrue(task.exception)
-        self.assertTrue(finished_fail.finished_exception)
-        self.assertEqual(task.exception, finished_fail.finished_exception)
+        self.assertTrue(finished_exception)
+        self.assertEqual(task.exception, finished_exception)
 
     def testTaskFromFunctionCanceledWhileQueued(self):
         """ test that task from finished is called with exception when task is terminated while queued"""
+        finished_exception = None
+
+        def finished_fail(e):
+            nonlocal finished_exception
+            assert e
+            finished_exception = e
+
         task = QgsTask.fromFunction('test task', run_no_result, on_finished=finished_fail)
         task.hold()
         QgsApplication.taskManager().addTask(task)
@@ -213,11 +211,19 @@ def testTaskFromFunctionCanceledWhileQueued(self):
 
         # check that the finished function was called
         self.assertTrue(task.exception)
-        self.assertTrue(finished_fail.finished_exception)
-        self.assertEqual(task.exception, finished_fail.finished_exception)
+        self.assertTrue(finished_exception)
+        self.assertEqual(task.exception, finished_exception)
 
     def testTaskFromFunctionFinishedWithVal(self):
         """ test that task from function can have callback finished function and is passed result values"""
+        result_value = None
+
+        def finished_single_value_result(e, value):
+            nonlocal result_value
+            assert e is None
+            result_value = value
+            return
+
         task = QgsTask.fromFunction('test task', run_single_val_result, on_finished=finished_single_value_result)
         QgsApplication.taskManager().addTask(task)
         while task.status() not in [QgsTask.Complete, QgsTask.Terminated]:
@@ -228,10 +234,20 @@ def testTaskFromFunctionFinishedWithVal(self):
         # check that the finished function was called
         self.assertEqual(task.returned_values, (5))
         self.assertFalse(task.exception)
-        self.assertEqual(finished_single_value_result.value, 5)
+        self.assertEqual(result_value, 5)
 
     def testTaskFromFunctionFinishedWithMultipleValues(self):
         """ test that task from function can have callback finished function and is passed multiple result values"""
+        result_value = None
+        result_statement = None
+
+        def finished_multiple_value_result(e, results):
+            nonlocal result_value
+            nonlocal result_statement
+            assert e is None
+            result_value = results[0]
+            result_statement = results[1]
+
         task = QgsTask.fromFunction('test task', run_multiple_val_result, on_finished=finished_multiple_value_result)
         QgsApplication.taskManager().addTask(task)
         while task.status() not in [QgsTask.Complete, QgsTask.Terminated]:
@@ -242,8 +258,8 @@ def testTaskFromFunctionFinishedWithMultipleValues(self):
         # check that the finished function was called
         self.assertEqual(task.returned_values, (5, 'whoo'))
         self.assertFalse(task.exception)
-        self.assertEqual(finished_multiple_value_result.value, 5)
-        self.assertEqual(finished_multiple_value_result.statement, 'whoo')
+        self.assertEqual(result_value, 5)
+        self.assertEqual(result_statement, 'whoo')
 
 
 if __name__ == '__main__':