Revert "Attempt to fix PySide6 issue in tests"

PierreRaybaut · PierreRaybaut · commit fe31462fb7d0 · 2024-06-13T10:39:13.000+02:00
This reverts commit b47bc8c.
diff --git a/qwt/tests/test_backingstore.py b/qwt/tests/test_backingstore.py
@@ -16,7 +16,7 @@ def __init__(self):
 
 def test_backingstore():
     """Test for backing store"""
-    return utils.test_widget(BackingStorePlot, size=(600, 400))
+    utils.test_widget(BackingStorePlot, size=(600, 400))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_bodedemo.py b/qwt/tests/test_bodedemo.py
@@ -296,10 +296,9 @@ def selected(self, _):
 
 def test_bodedemo():
     """Bode demo"""
-    app = utils.test_widget(BodeDemo, (640, 480))
+    utils.test_widget(BodeDemo, (640, 480))
     if os.path.isfile(FNAME_PDF):
         os.remove(FNAME_PDF)
-    return app
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_cartesian.py b/qwt/tests/test_cartesian.py
@@ -102,7 +102,7 @@ def __init__(self, *args):
 
 def test_cartesian():
     """Cartesian plot test"""
-    return utils.test_widget(CartesianPlot, (800, 480))
+    utils.test_widget(CartesianPlot, (800, 480))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_cpudemo.py b/qwt/tests/test_cpudemo.py
@@ -393,7 +393,7 @@ def __init__(self, parent=None, unattended=False):
 
 def test_cpudemo():
     """CPU demo"""
-    return utils.test_widget(CpuDemo, (600, 400))
+    utils.test_widget(CpuDemo, (600, 400))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_curvebenchmark1.py b/qwt/tests/test_curvebenchmark1.py
@@ -183,7 +183,7 @@ def run_benchmark(self, max_n, unattended, **kwargs):
 
 def test_curvebenchmark1():
     """Curve benchmark example"""
-    return utils.test_widget(CurveBenchmark1, options=False)
+    utils.test_widget(CurveBenchmark1, options=False)
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_curvebenchmark2.py b/qwt/tests/test_curvebenchmark2.py
@@ -84,7 +84,7 @@ def run_benchmark(self, max_n, unattended, **kwargs):
 
 def test_curvebenchmark2():
     """Curve styles benchmark example"""
-    return utils.test_widget(CurveBenchmark2, options=False)
+    utils.test_widget(CurveBenchmark2, options=False)
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_curvedemo1.py b/qwt/tests/test_curvedemo1.py
@@ -121,7 +121,7 @@ def drawContents(self, painter):
 
 def test_curvedemo1():
     """Curve demo 1"""
-    return utils.test_widget(CurveDemo1, size=(300, 600), options=False)
+    utils.test_widget(CurveDemo1, size=(300, 600), options=False)
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_curvedemo2.py b/qwt/tests/test_curvedemo2.py
@@ -120,7 +120,7 @@ def newValues(self):
 
 def test_curvedemo2():
     """Curve demo 2"""
-    return utils.test_widget(CurveDemo2, options=False)
+    utils.test_widget(CurveDemo2, options=False)
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_data.py b/qwt/tests/test_data.py
@@ -99,7 +99,7 @@ def timerEvent(self, e):
 
 def test_data():
     """Data Test"""
-    return utils.test_widget(DataPlot, size=(500, 300))
+    utils.test_widget(DataPlot, size=(500, 300))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_errorbar.py b/qwt/tests/test_errorbar.py
@@ -320,7 +320,7 @@ def __init__(self, parent=None, title=None):
 
 def test_errorbar():
     """Errorbar plot example"""
-    return utils.test_widget(ErrorBarPlot, size=(640, 480))
+    utils.test_widget(ErrorBarPlot, size=(640, 480))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_eventfilter.py b/qwt/tests/test_eventfilter.py
@@ -472,7 +472,7 @@ def __init__(self, parent=None):
 
 def test_eventfilter():
     """Event filter example"""
-    return utils.test_widget(EventFilterWindow, size=(540, 400))
+    utils.test_widget(EventFilterWindow, size=(540, 400))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_highdpi.py b/qwt/tests/test_highdpi.py
@@ -29,7 +29,7 @@ def test_highdpi():
     #  https://github.com/PlotPyStack/PythonQwt/issues/83)
     os.environ["QT_SCALE_FACTOR"] = "2"
 
-    return utils.test_widget(HighDPIPlot, (800, 480))
+    utils.test_widget(HighDPIPlot, (800, 480))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_image.py b/qwt/tests/test_image.py
@@ -197,7 +197,7 @@ def toggleVisibility(self, plotItem, idx):
 
 def test_image():
     """Image plot test"""
-    return utils.test_widget(ImagePlot, size=(600, 400))
+    utils.test_widget(ImagePlot, size=(600, 400))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_loadtest.py b/qwt/tests/test_loadtest.py
@@ -51,7 +51,7 @@ def run_benchmark(self, max_n, unattended, **kwargs):
 
 def test_loadtest():
     """Load test"""
-    return utils.test_widget(LoadTest, options=False)
+    utils.test_widget(LoadTest, options=False)
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_logcurve.py b/qwt/tests/test_logcurve.py
@@ -33,7 +33,7 @@ def __init__(self):
 
 def test_logcurve():
     """Log curve demo"""
-    return utils.test_widget(LogCurvePlot, size=(800, 500))
+    utils.test_widget(LogCurvePlot, size=(800, 500))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_mapdemo.py b/qwt/tests/test_mapdemo.py
@@ -99,7 +99,7 @@ def timerEvent(self, e):
 
 def test_mapdemo():
     """Map demo"""
-    return utils.test_widget(MapDemo, size=(600, 600))
+    utils.test_widget(MapDemo, size=(600, 600))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_multidemo.py b/qwt/tests/test_multidemo.py
@@ -72,7 +72,7 @@ def __init__(self, *args):
 
 def test_multidemo():
     """Multiple plot demo"""
-    return utils.test_widget(MultiDemo, size=(400, 300))
+    utils.test_widget(MultiDemo, size=(400, 300))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_simple.py b/qwt/tests/test_simple.py
@@ -68,11 +68,10 @@ def export_to_different_formats(self):
 
 def test_simple():
     """Simple plot example"""
-    app = utils.test_widget(SimplePlot, size=(600, 400))
+    utils.test_widget(SimplePlot, size=(600, 400))
     for fname in FNAMES:
         if os.path.isfile(fname):
             os.remove(fname)
-    return app
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_stylesheet.py b/qwt/tests/test_stylesheet.py
@@ -30,7 +30,7 @@ def __init__(self):
 )
 def test_stylesheet():
     """Stylesheet test"""
-    return utils.test_widget(StyleSheetPlot, size=(600, 400))
+    utils.test_widget(StyleSheetPlot, size=(600, 400))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_symbols.py b/qwt/tests/test_symbols.py
@@ -164,32 +164,32 @@ class SvgDocumentPlot(BaseSymbolPlot):
 
 def test_base():
     """Base symbol test"""
-    return utils.test_widget(BaseSymbolPlot, size=(600, 400))
+    utils.test_widget(BaseSymbolPlot, size=(600, 400))
 
 
 def test_builtin():
     """Built-in symbol test"""
-    return utils.test_widget(BuiltinSymbolPlot, size=(600, 400))
+    utils.test_widget(BuiltinSymbolPlot, size=(600, 400))
 
 
 def test_graphic():
     """Graphic symbol test"""
-    return utils.test_widget(GraphicPlot, size=(600, 400))
+    utils.test_widget(GraphicPlot, size=(600, 400))
 
 
 def test_pixmap():
     """Pixmap test"""
-    return utils.test_widget(PixmapPlot, size=(600, 400))
+    utils.test_widget(PixmapPlot, size=(600, 400))
 
 
 def test_path():
     """Path symbol test"""
-    return utils.test_widget(PathPlot, size=(600, 400))
+    utils.test_widget(PathPlot, size=(600, 400))
 
 
 def test_svg():
     """SVG test"""
-    return utils.test_widget(SvgDocumentPlot, size=(600, 400))
+    utils.test_widget(SvgDocumentPlot, size=(600, 400))
 
 
 if __name__ == "__main__":
diff --git a/qwt/tests/test_vertical.py b/qwt/tests/test_vertical.py
@@ -77,7 +77,7 @@ def show_layout_details(self):
 
 def test_vertical():
     """Vertical plot example"""
-    return utils.test_widget(VerticalPlot, size=(300, 650))
+    utils.test_widget(VerticalPlot, size=(300, 650))
 
 
 if __name__ == "__main__":
