Merge pull request #290 from ales-erjavec/tests/eager-cleanup

[MNT] WidgetTest: Cleanup on tearDown

Author: markotoplak

i18n/si/msgs.jaml

@@ -773,7 +773,7 @@ tests/base.py:
                 TRAVIS: false
                 APPVEYOR: false
             get_instance: false
-        def `tearDownClass`:
+        def `_clear_widgets`:
             _Cls__didCallOnDeleteWidget: false
         def `reset_default_settings`:
             settingsHandler: false

orangewidget/tests/base.py

@@ -270,9 +270,8 @@ def setUpClass(cls):
         super().setUpClass()
 
         cls.widgets = []
-
         cls.signal_manager = DummySignalManager()
-
+        cls.__report = None
         report = None
 
         def get_instance():
@@ -282,17 +281,16 @@ def get_instance():
                 report.have_report_warning_shown = True  # if missing QtWebView/QtWebKit
                 if not (os.environ.get("TRAVIS") or os.environ.get("APPVEYOR")):
                     report.show = Mock()
-                cls.widgets.append(report)
+                cls.__report = report
             return report
 
         cls.tear_down_stack.enter_context(
             patch.object(OWReport, "get_instance", get_instance)
         )
 
     @classmethod
-    def tearDownClass(cls) -> None:
-        cls.signal_manager.clear()
-        del cls.signal_manager
+    def _clear_widgets(cls):
+        """Clear and dispose of the widgets created via create_widget"""
         widgets = cls.widgets[:]
         cls.widgets.clear()
         while widgets:
@@ -302,11 +300,25 @@ def tearDownClass(cls) -> None:
             if not sip.isdeleted(w):
                 w.deleteLater()
             w.signalManager = None
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        cls.signal_manager.clear()
+        del cls.signal_manager
+        cls._clear_widgets()
+
+        if cls.__report is not None:
+            cls.__report.deleteLater()
+            cls.__report = None
+
         super().tearDownClass()
 
+    def setUp(self):
+        super().setUp()
+
     def tearDown(self):
-        """Process any pending events before the next test is executed."""
         self.signal_manager.clear()
+        self._clear_widgets()
         super().tearDown()
 
     def create_widget(self, cls: Type[T], stored_settings: Optional[dict]=None,
@@ -339,8 +351,9 @@ def create_widget(self, cls: Type[T], stored_settings: Optional[dict]=None,
         with open_widget_classes():
             class Cls(cls):
                 def onDeleteWidget(self):
-                    self.__didCallOnDeleteWidget = True
-                    super(Cls, self).onDeleteWidget()
+                    if not self.__didCallOnDeleteWidget:
+                        self.__didCallOnDeleteWidget = True
+                        super(Cls, self).onDeleteWidget()
                 __didCallOnDeleteWidget = False
 
             Cls.__name__ = cls.__name__

orangewidget/utils/overlay.py

@@ -27,6 +27,8 @@ class OverlayWidget(QWidget):
     """
     A widget positioned on top of another widget.
     """
+    __widget = None
+    __alignment = Qt.AlignmentFlag.AlignCenter
     def __init__(self, parent=None, alignment=Qt.AlignCenter, **kwargs):
         super().__init__(parent, **kwargs)
         self.setContentsMargins(0, 0, 0, 0)

orangewidget/utils/tests/test_widgetpreview.py

@@ -71,7 +71,7 @@ def tearDown(self) -> None:
         super().tearDown()
 
     def widget_constructor(self):
-        return self.create_widget(self.widgetClass)
+        return self.widgetClass()
 
 
 class TestWidgetPreview(TestWidgetPreviewBase):