Merge pull request #6044 from ales-erjavec/tests/fix-cleanup

[MNT] Fix tests cleanup

Author: markotoplak

Orange/widgets/model/tests/test_owgradientboosting.py

@@ -1,6 +1,7 @@
 import unittest
-from unittest.mock import patch, Mock
 import sys
+from typing import Type
+from unittest.mock import patch, Mock
 
 from Orange.classification import GBClassifier
 
@@ -27,7 +28,7 @@
     CatGBRegressor = None
 from Orange.widgets.model.owgradientboosting import OWGradientBoosting, \
     LearnerItemModel, GBLearnerEditor, XGBLearnerEditor, XGBRFLearnerEditor, \
-    CatGBLearnerEditor
+    CatGBLearnerEditor, BaseEditor
 from Orange.widgets.settings import SettingProvider
 from Orange.widgets.tests.base import WidgetTest, ParameterMapping, \
     WidgetLearnerTestMixin, datasets, simulate, GuiTest
@@ -66,11 +67,22 @@ def test_missing_lib(self):
         self.assertFalse(model.item(1).isEnabled())
 
 
-class TestGBLearnerEditor(GuiTest):
+class BaseEditorTest(GuiTest):
+    EditorClass: Type[BaseEditor] = None
+
     def setUp(self):
-        editor_class = GBLearnerEditor
+        super().setUp()
+        editor_class = self.EditorClass
         self.widget = create_parent(editor_class)
-        self.editor = editor_class(self.widget)
+        self.editor = editor_class(self.widget)  # pylint: disable=not-callable
+
+    def tearDown(self) -> None:
+        self.widget.deleteLater()
+        super().tearDown()
+
+
+class TestGBLearnerEditor(BaseEditorTest):
+    EditorClass = GBLearnerEditor
 
     def test_arguments(self):
         args = {"n_estimators": 100, "learning_rate": 0.1, "max_depth": 3,
@@ -116,11 +128,8 @@ def test_default_parameters_reg(self):
         self.assertIsNone(params["random_state"])
 
 
-class TestXGBLearnerEditor(GuiTest):
-    def setUp(self):
-        editor_class = XGBLearnerEditor
-        self.widget = create_parent(editor_class)
-        self.editor = editor_class(self.widget)
+class TestXGBLearnerEditor(BaseEditorTest):
+    EditorClass = XGBLearnerEditor
 
     def test_arguments(self):
         args = {"n_estimators": 100, "learning_rate": 0.3, "max_depth": 6,
@@ -181,11 +190,8 @@ def test_default_parameters_reg(self):
                          self.editor.colsample_bynode)
 
 
-class TestXGBRFLearnerEditor(GuiTest):
-    def setUp(self):
-        editor_class = XGBRFLearnerEditor
-        self.widget = create_parent(editor_class)
-        self.editor = editor_class(self.widget)
+class TestXGBRFLearnerEditor(BaseEditorTest):
+    EditorClass = XGBRFLearnerEditor
 
     def test_arguments(self):
         args = {"n_estimators": 100, "learning_rate": 0.3, "max_depth": 6,
@@ -247,11 +253,8 @@ def test_default_parameters_reg(self):
                          self.editor.colsample_bynode)
 
 
-class TestCatGBLearnerEditor(GuiTest):
-    def setUp(self):
-        editor_class = CatGBLearnerEditor
-        self.widget = create_parent(editor_class)
-        self.editor = editor_class(self.widget)
+class TestCatGBLearnerEditor(BaseEditorTest):
+    EditorClass = CatGBLearnerEditor
 
     def test_arguments(self):
         args = {"n_estimators": 100, "learning_rate": 0.3, "max_depth": 6,

Orange/widgets/utils/tests/concurrent_example.py

@@ -69,7 +69,7 @@ def _toggle_run(self):
         if self.task is not None:
             self.cancel()
             self.run_button.setText("Resume")
-            self.commit()
+            self.commit.deferred()
         # Resume task
         else:
             self._run()