From 1a4ca179a98e5839f559488a77fb8d6f0c09b1bb Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 4 Nov 2024 13:19:38 +0100 Subject: [PATCH] tests: Properly skip Pmw tests when tkinter is not present --- tests/test_imports.py | 1 + tests/tkpanels/test_ParticlePanel.py | 1 + tests/tkpanels/test_Placer.py | 1 + tests/tkwidgets/test_AppShell.py | 1 + tests/tkwidgets/test_EntryScale.py | 1 + tests/tkwidgets/test_Floater.py | 1 + tests/tkwidgets/test_VectorWidgets.py | 1 + 7 files changed, 7 insertions(+) diff --git a/tests/test_imports.py b/tests/test_imports.py index c31c2a461f..c49aa43e9c 100644 --- a/tests/test_imports.py +++ b/tests/test_imports.py @@ -268,6 +268,7 @@ def test_imports_direct_net(): def test_imports_tk(): + pytest.importorskip('tkinter') Pmw = pytest.importorskip('Pmw') import direct.showbase.TkGlobal diff --git a/tests/tkpanels/test_ParticlePanel.py b/tests/tkpanels/test_ParticlePanel.py index e1498a4868..d80c0eac2f 100644 --- a/tests/tkpanels/test_ParticlePanel.py +++ b/tests/tkpanels/test_ParticlePanel.py @@ -1,4 +1,5 @@ import pytest +pytest.importorskip('tkinter') Pmw = pytest.importorskip('Pmw') from direct.tkpanels.ParticlePanel import ParticlePanel diff --git a/tests/tkpanels/test_Placer.py b/tests/tkpanels/test_Placer.py index 1cc146efeb..353afdf5a8 100644 --- a/tests/tkpanels/test_Placer.py +++ b/tests/tkpanels/test_Placer.py @@ -1,4 +1,5 @@ import pytest +pytest.importorskip('tkinter') Pmw = pytest.importorskip('Pmw') from direct.showbase.ShowBase import ShowBase from direct.tkpanels.Placer import Placer diff --git a/tests/tkwidgets/test_AppShell.py b/tests/tkwidgets/test_AppShell.py index e87889d34b..831407ed04 100644 --- a/tests/tkwidgets/test_AppShell.py +++ b/tests/tkwidgets/test_AppShell.py @@ -1,4 +1,5 @@ import pytest +pytest.importorskip('tkinter') pytest.importorskip('Pmw') from direct.tkwidgets import AppShell diff --git a/tests/tkwidgets/test_EntryScale.py b/tests/tkwidgets/test_EntryScale.py index f06fb036ed..496376328d 100644 --- a/tests/tkwidgets/test_EntryScale.py +++ b/tests/tkwidgets/test_EntryScale.py @@ -1,4 +1,5 @@ import pytest +pytest.importorskip('tkinter') pytest.importorskip('Pmw') from direct.tkwidgets.EntryScale import EntryScale, EntryScaleGroup diff --git a/tests/tkwidgets/test_Floater.py b/tests/tkwidgets/test_Floater.py index dfd470763f..45a3b0ae7d 100644 --- a/tests/tkwidgets/test_Floater.py +++ b/tests/tkwidgets/test_Floater.py @@ -1,4 +1,5 @@ import pytest +pytest.importorskip('tkinter') pytest.importorskip('Pmw') from direct.tkwidgets.Floater import Floater, FloaterGroup diff --git a/tests/tkwidgets/test_VectorWidgets.py b/tests/tkwidgets/test_VectorWidgets.py index fecad4cfa7..892701a149 100644 --- a/tests/tkwidgets/test_VectorWidgets.py +++ b/tests/tkwidgets/test_VectorWidgets.py @@ -1,4 +1,5 @@ import pytest +pytest.importorskip('tkinter') pytest.importorskip('Pmw') from direct.tkwidgets import VectorWidgets