Skip to content

Commit

Permalink
Revert "Attempt to fix PySide6 issue in tests"
Browse files Browse the repository at this point in the history
This reverts commit b47bc8c.
  • Loading branch information
PierreRaybaut committed Jun 13, 2024
1 parent b47bc8c commit fe31462
Show file tree
Hide file tree
Showing 21 changed files with 26 additions and 28 deletions.
2 changes: 1 addition & 1 deletion qwt/tests/test_backingstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
3 changes: 1 addition & 2 deletions qwt/tests/test_bodedemo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_cartesian.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_cpudemo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_curvebenchmark1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_curvebenchmark2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_curvedemo1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_curvedemo2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_errorbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_eventfilter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_highdpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_loadtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_logcurve.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_mapdemo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_multidemo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
3 changes: 1 addition & 2 deletions qwt/tests/test_simple.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_stylesheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
12 changes: 6 additions & 6 deletions qwt/tests/test_symbols.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion qwt/tests/test_vertical.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down

0 comments on commit fe31462

Please sign in to comment.