MacOs Test

Signed-off-by: Omkar Sarkar <omkarsarkar24@gmail.com>

Author: OmkarSarkar204

.github/workflows/pytest.yml

@@ -29,13 +29,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [ubuntu-latest, macos-latest, windows-latest]
-        # python-version: ["3.9", "3.10", "3.11", "3.12", "pypy3.9", "pypy3.10"]
-        os: [ubuntu-latest]
-        python-version: ["3.9", "3.14", "3.14t"]
+        include:
+          - os: ubuntu-latest
+            python-version: "3.9"
+          - os: ubuntu-latest
+            python-version: "3.14"
+          - os: ubuntu-latest
+            python-version: "3.14t"
+          - os: macos-latest
+            python-version: "3.9"
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
+        if: matrix.os != 'windows-latest'
         uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
         with:
           egress-policy: audit
@@ -50,37 +56,30 @@ jobs:
           python-version: ${{ matrix.python-version }}
           activate-environment: true
 
-      - name: Install system dependencies for GUI testing
+      - name: Install system dependencies for GUI testing on linux
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          # Only install system Tcl/Tk for Python < 3.13 (newer versions bundle their own)
-          if [[ "${{ matrix.python-version }}" < "3.13" ]]; then
-            echo "Installing system Tcl/Tk 8.6 for Python ${{ matrix.python-version }}"
-            sudo apt-get install -y python3-tk tcl8.6 tk8.6 libtcl8.6 libtk8.6
-          else
-            echo "Python ${{ matrix.python-version }} uses bundled Tcl/Tk, skipping system packages"
-            # Only install tools, not Tcl/Tk libraries
-            sudo apt-get install -y scrot xdotool x11-utils gnome-screenshot
-          fi
-          python3 --version && python3 -c "import tkinter; print(tkinter.TclVersion, tkinter.TkVersion)"
+          sudo apt-get install -y xvfb python3-tk tcl tk tcl-dev tk-dev libx11-6 libxrender1 libxext6 libsm6 scrot xdotool x11-utils
+          python3 --version
+          python3 -c "import tkinter; print('Tk OK:', tkinter.TclVersion, tkinter.TkVersion)"
 
-      - name: Ensure Tcl/Tk search paths
+      - name: Install system dependencies for GUI testing on macOS
+        if: matrix.os == 'macos-latest'
         run: |
-          # Only set Tcl/Tk paths for Python < 3.13
-          if [[ "${{ matrix.python-version }}" < "3.13" ]]; then
-            echo "Setting Tcl/Tk paths for Python ${{ matrix.python-version }}"
-            echo "TCL_LIBRARY=/usr/share/tcltk/tcl8.6" >> $GITHUB_ENV
-            echo "TK_LIBRARY=/usr/share/tcltk/tk8.6" >> $GITHUB_ENV
-          else
-            echo "Python ${{ matrix.python-version }} uses bundled Tcl/Tk, no custom paths needed"
-          fi
+          brew install tcl-tk
+          echo "LDFLAGS=-L$(brew --prefix tcl-tk)/lib" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$(brew --prefix tcl-tk)/include" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$(brew --prefix tcl-tk)/lib/pkgconfig" >> $GITHUB_ENV
+          python3 -c "import tkinter; print('Tk OK:', tkinter.TclVersion, tkinter.TkVersion)"
 
       - name: Install dependencies and application
         # without --editable, the coverage report is not generated correctly
         run: |
           uv pip install --editable .[dev,ci_headless_tests]
 
       - name: Download ArduCopter SITL (if available)
+        if: matrix.os == 'ubuntu-latest'
         run: |
           # Create cache key based on current quarter (YYYY-Q)
           CURRENT_YEAR=$(date +%Y)
@@ -132,21 +131,19 @@ jobs:
         continue-on-error: false
         run: |
           export LIBGL_ALWAYS_SOFTWARE=1
-          export DISPLAY=:99
-          # disable X authentication
-          export XAUTHORITY=/dev/null
-          # disable access control restrictions
-          Xvfb :99 -screen 0 1024x768x16 -ac &
-          # ensure Xvfb is fully started before running tests
-          sleep 2
-          if [ "$SITL_AVAILABLE" = "true" ]; then
-            echo "Running tests with SITL support"
-            uv run pytest --cov=ardupilot_methodic_configurator --cov-report=xml:tests/coverage.xml --md=tests/results-${{ matrix.python-version }}.md --junit-xml=tests/results-junit.xml -m "sitl or not sitl"
+
+          if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
+            export DISPLAY=:99
+            export XAUTHORITY=/dev/null
+            Xvfb :99 -screen 0 1024x768x16 -ac &
+            sleep 2
+            FINAL_MARKER="sitl or not sitl"
           else
-            echo "Running tests without SITL (mocked tests only)"
-            uv run pytest --cov=ardupilot_methodic_configurator --cov-report=xml:tests/coverage.xml --md=tests/results-${{ matrix.python-version }}.md --junit-xml=tests/results-junit.xml -m "not sitl"
+            FINAL_MARKER="not gui and not acceptance"
           fi
 
+          echo "Running tests with markers: $FINAL_MARKER"
+          uv run pytest --cov=ardupilot_methodic_configurator --cov-report=xml:tests/coverage.xml --md=tests/results-${{ matrix.python-version }}.md --junit-xml=tests/results-junit.xml -m "$FINAL_MARKER"
       - name: Fix coverage paths
         run: |
           sed -i 's|<package name="." |<package name="ardupilot_methodic_configurator" |' tests/coverage.xml
@@ -160,13 +157,13 @@ jobs:
         if: ${{ always() }}
 
       - name: Upload coverage xml report
+      # Use always() to always run this step to publish test results when there are test failures
+        if: matrix.os == 'ubuntu-latest' && always()
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
             name: coverage-${{ matrix.python-version }}-xml
             path: tests/*.xml
             retention-days: 1
-        # Use always() to always run this step to publish test results when there are test failures
-        if: ${{ always() }}
 
       - name: Upload coverage report
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
@@ -175,8 +172,6 @@ jobs:
             path: .coverage
             include-hidden-files: true
             retention-days: 1
-        # Use always() to always run this step to publish test results when there are test failures
-        if: ${{ always() }}
 
   upload_coverage_to_coveralls:
     if: (github.event_name == 'push' && github.ref == 'refs/heads/master') && (success() || failure())

pytest.ini

@@ -14,3 +14,4 @@ markers =
     integration: mark a test as an integration test
     slow: mark a test as slow running
     sitl: mark a test as requiring SITL (real ArduPilot simulation)
+    gui: requires real GUI (tkinter, windows, cocoa)

tests/acceptance_battery_monitor.py

@@ -30,6 +30,8 @@
 )
 from ardupilot_methodic_configurator.plugin_factory import plugin_factory
 
+pytestmark = pytest.mark.gui
+
 # pylint: disable=redefined-outer-name,protected-access,too-many-lines
 
 

tests/conftest.py

@@ -498,3 +498,11 @@ def sitl_flight_controller(sitl_manager: SITLManager) -> Generator[FlightControl
 
     # Cleanup connection but keep SITL running for subsequent tests
     fc.disconnect()
+
+
+@pytest.fixture(autouse=True)
+def mock_center_window_for_macos_only() -> None:
+    """Only mock center_window on macOS to prevent Tkinter crashes. Let Linux run normally."""
+    if platform.system() == "Darwin":
+        patcher = patch("ardupilot_methodic_configurator.frontend_tkinter_base_window.BaseWindow.center_window")
+        patcher.start()

tests/gui_frontend_tkinter_parameter_editor.py

@@ -106,6 +106,7 @@ def test_show_about_window(self, mocker) -> None:  # pylint: disable=too-many-lo
             # Check window properties
             assert about_window.title() == "About"
             # Check that geometry contains the expected size (position may vary)
+            about_window.update_idletasks()
             geometry = about_window.geometry()
             assert "650x340" in geometry
 

tests/test_backend_mavftp.py

@@ -17,8 +17,7 @@
 
 # from unittest.mock import patch
 from io import StringIO
-
-from pymavlink import mavutil
+from unittest.mock import MagicMock
 
 # from ardupilot_methodic_configurator.backend_mavftp import ERR_NoErrorCodeInPayload
 # from ardupilot_methodic_configurator.backend_mavftp import ERR_NoErrorCodeInNack
@@ -65,10 +64,10 @@ def setUp(self) -> None:
         logger.setLevel(logging.DEBUG)
 
         # Mock mavutil.mavlink_connection to simulate a connection
-        self.mock_master = mavutil.mavlink_connection(device="udp:localhost:14550", source_system=1)
+        self.mock_master = MagicMock()
 
         # Initialize MAVFTP instance for testing
-        self.mav_ftp = MAVFTP(self.mock_master, target_system=1, target_component=1)
+        self.mav_ftp = MAVFTP(self.mock_master, 1, 0)
 
     def tearDown(self) -> None:
         self.log_stream.seek(0)

tests/test_frontend_tkinter_rich_text.py

@@ -184,8 +184,8 @@ def tearDown(self) -> None:
     def test_get_widget_font_family_and_size(self) -> None:
         label = ttk.Label(self.root, text="Test")
         family, size = get_widget_font_family_and_size(label)
-        expected_family = ["Segoe UI"] if platform_system() == "Windows" else ["Helvetica", "sans-serif"]
-        expected_size = [9] if platform_system() == "Windows" else [-12, 10]
+        expected_family = ["Segoe UI"] if platform_system() == "Windows" else ["Helvetica", "sans-serif", ".AppleSystemUIFont"]
+        expected_size = [9] if platform_system() == "Windows" else [-12, 10, 13]
         assert isinstance(family, str)
         assert isinstance(size, int)
         assert family in expected_family

tests/test_frontend_tkinter_usage_popup_window.py

@@ -45,6 +45,13 @@ def popup_window(tk_root) -> BaseWindow:
         window.root.destroy()
 
 
+@pytest.fixture(autouse=True)
+def mock_center_window_for_macos() -> None:
+    """Mock center_window globally for all tests in this file to prevent macOS Tkinter segfaults/hangs."""
+    patcher = patch("ardupilot_methodic_configurator.frontend_tkinter_base_window.BaseWindow.center_window")
+    patcher.start()
+
+
 @pytest.fixture
 def rich_text_widget(popup_window) -> RichText:
     """Fixture providing a RichText widget for popup instructions."""
@@ -140,6 +147,7 @@ def test_show_again_checkbox_updates_user_preferences(self, popup_window, mock_p
         # Assert: Settings updated correctly
         mock_program_settings.set_display_usage_popup.assert_called_with("test_popup", show=False)
 
+    @patch("ardupilot_methodic_configurator.frontend_tkinter_usage_popup_window.sys_platform", "linux")
     def test_closing_popup_returns_focus_to_parent_window(
         self,
         popup_window,
@@ -182,6 +190,7 @@ def test_popup_shows_correct_title_and_content(self, tk_root, popup_window, rich
         with (
             patch("tkinter.BooleanVar") as mock_bool_var,
             patch.object(popup_window.root, "grab_set"),
+            patch.object(tk_root, "wait_window"),
         ):
             mock_var_instance = MagicMock()
             mock_bool_var.return_value = mock_var_instance
@@ -226,6 +235,7 @@ def test_user_can_dismiss_popup_with_button(self, tk_root, popup_window, rich_te
         with (
             patch("tkinter.BooleanVar"),
             patch.object(popup_window.root, "grab_set"),
+            patch.object(tk_root, "wait_window"),
         ):
             UsagePopupWindow.display(
                 parent=tk_root,
@@ -249,6 +259,7 @@ def test_user_can_dismiss_popup_with_button(self, tk_root, popup_window, rich_te
                 # Assert: Window closes as expected
                 mock_destroy.assert_called_once()
 
+    @patch("ardupilot_methodic_configurator.frontend_tkinter_usage_popup_window.sys_platform", "linux")
     def test_popup_prevents_interaction_with_other_windows(self, tk_root, popup_window, rich_text_widget) -> None:
         """
         Popup window prevents user interaction with other application windows.
@@ -262,7 +273,9 @@ def test_popup_prevents_interaction_with_other_windows(self, tk_root, popup_wind
             patch.object(popup_window.root, "grab_set") as mock_grab_set,
             patch.object(popup_window.root, "withdraw"),
             patch.object(popup_window.root, "deiconify"),
+            patch.object(popup_window.root, "update_idletasks"),
             patch("tkinter.BooleanVar"),
+            patch.object(tk_root, "wait_window"),
         ):
             UsagePopupWindow.display(
                 parent=tk_root,
@@ -276,6 +289,7 @@ def test_popup_prevents_interaction_with_other_windows(self, tk_root, popup_wind
             # Assert: Popup becomes modal to focus user attention
             mock_grab_set.assert_called_once()
 
+    @patch("ardupilot_methodic_configurator.frontend_tkinter_usage_popup_window.sys_platform", "linux")
     def test_closing_popup_returns_focus_to_parent_window(self, tk_root, popup_window) -> None:
         """
         Closing popup window properly releases focus and returns control to parent.