Keep Qt guards skipping when PySide6 imports but its libs are missing

JE-Chen · JE-Chen · commit cd5979688c06 · 2026-07-23T10:33:50.000+08:00
pytest 9.1 changed `importorskip`'s default `exc_type` from ImportError to
ModuleNotFoundError, so the container — which has PySide6 installed but no
libEGL — turned 16 previously skipped GUI modules into collection errors.
Ask for the old behaviour explicitly on the Qt guards.

Also move the workflow NOSONAR justifications onto the flagged lines; a
comment on the preceding line does not suppress githubactions:S8544.
diff --git a/.github/workflows/platform-smoke.yml b/.github/workflows/platform-smoke.yml
@@ -22,8 +22,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      # NOSONAR githubactions:S8544  # reason: installs the checked-out project itself, there is no upstream version to lock
-      - run: python -m pip install -e .
+      - run: python -m pip install -e .  # NOSONAR githubactions:S8544  # reason: installs the checked-out project itself, there is no upstream version to lock
       # The X11 backend connects to a display at import time, so Linux
       # runs need a virtual one.
       - name: Install a virtual display (Linux)
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -110,7 +110,6 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      # NOSONAR githubactions:S8544  # reason: installs the checked-out project itself, there is no upstream version to lock
-      - run: pip install -e .
+      - run: pip install -e .  # NOSONAR githubactions:S8541,githubactions:S8544  # reason: installs the checked-out project itself, there is no upstream version to lock and the build must run
       - run: "pip install --only-binary :all: mypy==2.3.0"
       - run: mypy je_auto_control/api je_auto_control/utils/failure_bundle
diff --git a/test/unit_test/headless/test_actions_menu_gui.py b/test/unit_test/headless/test_actions_menu_gui.py
@@ -14,7 +14,7 @@
 
 import pytest
 
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 _PROBE = r"""
 import json
diff --git a/test/unit_test/headless/test_admin_console_thumbnails_gui.py b/test/unit_test/headless/test_admin_console_thumbnails_gui.py
@@ -6,7 +6,7 @@
 import pytest
 
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 from PySide6.QtWidgets import QApplication  # noqa: E402
 
diff --git a/test/unit_test/headless/test_audit_log_tab_filter.py b/test/unit_test/headless/test_audit_log_tab_filter.py
@@ -10,7 +10,7 @@
 # webrtc_panel → aiortc). Only the helper function in the same module
 # is pure; gate the whole module on Qt + the webrtc extra to keep the
 # import chain happy.
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 pytest.importorskip("av")
 pytest.importorskip("aiortc")
 
diff --git a/test/unit_test/headless/test_qa_tabs_b_gui.py b/test/unit_test/headless/test_qa_tabs_b_gui.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
 
diff --git a/test/unit_test/headless/test_qa_tabs_gui.py b/test/unit_test/headless/test_qa_tabs_gui.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
 
diff --git a/test/unit_test/headless/test_r3_gui_main_window.py b/test/unit_test/headless/test_r3_gui_main_window.py
@@ -10,7 +10,7 @@
 import pytest
 
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 # main_window imports qt_material (the theme); the headless CI job installs
 # PySide6 but not the GUI theme extra, so skip cleanly there rather than erroring
 # out collection for the whole suite.
diff --git a/test/unit_test/headless/test_r3_gui_script_builder.py b/test/unit_test/headless/test_r3_gui_script_builder.py
@@ -14,7 +14,7 @@
 import pytest
 
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 from PySide6.QtWidgets import QAbstractItemView, QApplication  # noqa: E402
 
diff --git a/test/unit_test/headless/test_r3_gui_slot_exceptions.py b/test/unit_test/headless/test_r3_gui_slot_exceptions.py
@@ -17,7 +17,7 @@
 import pytest
 
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 from je_auto_control.utils.exception.exceptions import (  # noqa: E402
     AutoControlExecuteActionException, AutoControlHTMLException,
diff --git a/test/unit_test/headless/test_r3_gui_thread_marshal.py b/test/unit_test/headless/test_r3_gui_thread_marshal.py
@@ -17,7 +17,7 @@
 import pytest
 
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 import shiboken6  # noqa: E402
 from PySide6.QtCore import QEvent, QObject, QThread  # noqa: E402
diff --git a/test/unit_test/headless/test_recording_editor_undo.py b/test/unit_test/headless/test_recording_editor_undo.py
@@ -4,7 +4,7 @@
 import pytest
 
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 from PySide6.QtWidgets import QApplication  # noqa: E402
 
diff --git a/test/unit_test/headless/test_remote_desktop_cursor.py b/test/unit_test/headless/test_remote_desktop_cursor.py
@@ -135,7 +135,7 @@ def test_frame_display_paints_cursor_overlay():
     """Setting the remote cursor must mutate state + trigger update."""
     import os
     os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
-    pytest.importorskip("PySide6.QtWidgets")
+    pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
     from PySide6.QtWidgets import QApplication
     if QApplication.instance() is None:
         QApplication([])
diff --git a/test/unit_test/headless/test_remote_desktop_gui.py b/test/unit_test/headless/test_remote_desktop_gui.py
@@ -15,7 +15,7 @@
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
 
 PIL = pytest.importorskip("PIL.Image")
-pyside = pytest.importorskip("PySide6.QtWidgets")
+pyside = pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 # These tests round-trip JPEG frames through the WebRTC stack — skip
 # entirely on environments that lack the optional 'webrtc' extra (aiortc
 # + PyAV), since the registry singleton imports webrtc_transport on use.
diff --git a/test/unit_test/headless/test_remote_desktop_quick_connect.py b/test/unit_test/headless/test_remote_desktop_quick_connect.py
@@ -8,7 +8,7 @@
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
 
 PIL = pytest.importorskip("PIL.Image")
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 from PySide6.QtWidgets import QApplication  # noqa: E402
 
diff --git a/test/unit_test/headless/test_script_builder_param_preservation.py b/test/unit_test/headless/test_script_builder_param_preservation.py
@@ -6,7 +6,7 @@
 """
 import pytest
 
-pytest.importorskip("PySide6.QtWidgets")  # skips if Qt libs (e.g. libEGL) absent
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)  # skips if Qt libs (e.g. libEGL) absent
 
 from PySide6.QtWidgets import QApplication  # noqa: E402
 
diff --git a/test/unit_test/headless/test_usb_acl_prompt.py b/test/unit_test/headless/test_usb_acl_prompt.py
@@ -8,7 +8,7 @@
 # Force offscreen so the dialog never tries to draw on a real display.
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
 
-pyside = pytest.importorskip("PySide6.QtWidgets")
+pyside = pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 # gui/__init__.py eagerly loads main_window → webrtc_panel → aiortc.
 # The dialog itself only needs Qt, but we have to satisfy the chain
 # to import anything from je_auto_control.gui.
diff --git a/test/unit_test/headless/test_usb_browser_tab.py b/test/unit_test/headless/test_usb_browser_tab.py
@@ -6,7 +6,7 @@
 # fetch_remote_devices is pure, but it lives next to a Qt widget that
 # transitively pulls aiortc via gui/__init__.py. Skip the whole file
 # unless the webrtc extra is installed.
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 pytest.importorskip("av")
 pytest.importorskip("aiortc")
 
diff --git a/test/unit_test/headless/test_usb_passthrough_panel.py b/test/unit_test/headless/test_usb_passthrough_panel.py
@@ -8,7 +8,7 @@
 
 import pytest
 
-pytest.importorskip("PySide6.QtWidgets")
+pytest.importorskip("PySide6.QtWidgets", exc_type=ImportError)
 
 # Force a headless Qt platform before any QApplication is created.
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
