Expand cross-platform test coverage

Author: bx33661

.github/workflows/ci.yml

@@ -2,9 +2,10 @@ name: CI
 
 on:
   push:
-    branches: [ "master", "main" ]
+    branches: [ "master", "main", "codex/**" ]
   pull_request:
     branches: [ "master", "main" ]
+  workflow_dispatch:
 
 jobs:
   lint:
@@ -32,9 +33,11 @@ jobs:
       run: mypy --package wireshark_mcp --ignore-missing-imports --no-namespace-packages
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
@@ -50,15 +53,34 @@ jobs:
         python -m pip install --upgrade pip
         pip install .[dev]
 
+    - name: Run tests with coverage
+      run: |
+        pytest tests/ --cov=wireshark_mcp --cov-report=term-missing -v
+
+    - name: Compile check
+      run: python -m compileall src/
+
+  integration-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: "3.12"
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install .[dev]
+
     - name: Install TShark
       run: |
         sudo apt-get update
         sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y tshark
         tshark -v
 
-    - name: Run tests with coverage
+    - name: Run Linux TShark integration smoke tests
       run: |
-        pytest tests/ --cov=wireshark_mcp --cov-report=term-missing -v
-
-    - name: Compile check
-      run: python -m compileall src/
+        pytest tests/test_client.py -k "real_tshark" -v

tests/test_client.py

@@ -1,6 +1,7 @@
 """Tests for TSharkClient core functionality."""
 
 import json
+import shutil
 
 import pytest
 
@@ -106,6 +107,27 @@ def test_client_prefers_env_tool_paths(self, monkeypatch) -> None:
         assert client.dumpcap_path == "/opt/wireshark/dumpcap"
         assert client.text2pcap_path == "/opt/wireshark/text2pcap"
 
+    def test_describe_capabilities_reports_capture_backend_fallback(self, mock_client) -> None:
+        capabilities = mock_client.describe_capabilities()
+        assert capabilities["_meta"]["capture_backend"] == "dumpcap"
+        assert capabilities["dumpcap"]["requirement"] == "optional"
+
+        mock_client.dumpcap_path = None
+        mock_client._tool_paths["dumpcap"] = None
+
+        fallback_capabilities = mock_client.describe_capabilities()
+        assert fallback_capabilities["_meta"]["capture_backend"] == "tshark"
+
+    @pytest.mark.asyncio
+    async def test_check_capabilities_detects_real_tshark_when_installed(self) -> None:
+        if shutil.which("tshark") is None:
+            pytest.skip("tshark not installed on this host")
+
+        result = await TSharkClient().check_capabilities()
+
+        assert result["success"]
+        assert result["data"]["tshark"]["available"] is True
+
 
 class TestRunCommand:
     """Tests for _run_command error handling."""
@@ -140,6 +162,21 @@ async def test_binary_whitelist_allows_windows_exe_names_case_insensitive(self,
 
 
 class TestSuiteBehavior:
+    @pytest.mark.asyncio
+    async def test_list_interfaces_prefers_dumpcap_when_available(self, mock_client) -> None:
+        result = await mock_client.list_interfaces()
+        assert "dumpcap" in result
+        assert mock_client._last_cmd[0] == "dumpcap"
+
+    @pytest.mark.asyncio
+    async def test_list_interfaces_falls_back_to_tshark(self, mock_client) -> None:
+        mock_client.dumpcap_path = None
+        mock_client._tool_paths["dumpcap"] = None
+
+        result = await mock_client.list_interfaces()
+        assert "tshark" in result
+        assert mock_client._last_cmd[0] == "tshark"
+
     @pytest.mark.asyncio
     async def test_capture_prefers_dumpcap_when_available(self, mock_client) -> None:
         result = await mock_client.capture_packets("en0", "/tmp/out.pcapng", duration=10)

tests/test_files.py

@@ -74,6 +74,6 @@ async def test_text2pcap_import_command(self, mock_client: MockTSharkClient) ->
             ascii_mode=True,
         )
         assert "text2pcap" in result
-        assert '-t %H:%M:%S.%f' in result
+        assert "-t %H:%M:%S.%f" in result
         assert "-a" in result
         assert "-E ether" in result

tests/test_installer.py

@@ -11,6 +11,8 @@
     _get_linux_config_home,
     _get_mcp_servers_dict,
     _get_python_executable,
+    _iter_wireshark_search_dirs,
+    _join_path,
     _read_json_config,
     _render_codex_toml_block,
     _write_json_config,
@@ -276,10 +278,35 @@ def test_uninstall_removes_codex_toml_block(self, tmp_path):
 
 
 class TestPlatformConfigs:
+    def test_join_path_uses_target_platform_separators(self):
+        assert _join_path("/Users/tester", "Library", "Claude") == "/Users/tester/Library/Claude"
+        assert (
+            _join_path(r"C:\Users\tester", "AppData", "Roaming", platform="win32") == r"C:\Users\tester\AppData\Roaming"
+        )
+
     def test_linux_config_home_uses_xdg(self, monkeypatch):
         monkeypatch.setenv("XDG_CONFIG_HOME", "/tmp/xdg-config")
         assert _get_linux_config_home("/home/tester") == "/tmp/xdg-config"
 
+    def test_mac_client_configs_use_application_support(self, monkeypatch):
+        monkeypatch.setattr("wireshark_mcp.installer.sys.platform", "darwin")
+        monkeypatch.setattr("wireshark_mcp.installer.os.path.expanduser", lambda _: "/Users/tester")
+
+        configs = _get_client_configs()
+
+        assert configs["Claude"] == (
+            "/Users/tester/Library/Application Support/Claude",
+            "claude_desktop_config.json",
+        )
+        assert configs["Zed"] == (
+            "/Users/tester/Library/Application Support/Zed",
+            "settings.json",
+        )
+        assert configs["VS Code"] == (
+            "/Users/tester/Library/Application Support/Code/User",
+            "settings.json",
+        )
+
     def test_linux_client_configs_use_xdg(self, monkeypatch):
         monkeypatch.setattr("wireshark_mcp.installer.sys.platform", "linux")
         monkeypatch.setattr("wireshark_mcp.installer.os.path.expanduser", lambda _: "/home/tester")
@@ -306,3 +333,27 @@ def test_windows_client_configs_include_supported_paths(self, monkeypatch):
             r"C:\Users\tester\AppData\Roaming\Code\User",
             "settings.json",
         )
+
+    def test_iter_wireshark_search_dirs_for_macos(self, monkeypatch):
+        monkeypatch.setattr("wireshark_mcp.installer.sys.platform", "darwin")
+        monkeypatch.setattr("wireshark_mcp.installer.os.path.expanduser", lambda _: "/Users/tester")
+
+        search_dirs = _iter_wireshark_search_dirs()
+
+        assert "/Applications/Wireshark.app/Contents/MacOS" in search_dirs
+        assert "/Applications/Wireshark.app/Contents/Helpers" in search_dirs
+        assert "/Users/tester/Applications/Wireshark.app/Contents/MacOS" in search_dirs
+        assert "/opt/homebrew/bin" in search_dirs
+
+    def test_iter_wireshark_search_dirs_for_windows(self, monkeypatch):
+        monkeypatch.setattr("wireshark_mcp.installer.sys.platform", "win32")
+        monkeypatch.setattr("wireshark_mcp.installer.os.path.expanduser", lambda _: r"C:\Users\tester")
+        monkeypatch.setenv("LOCALAPPDATA", r"C:\Users\tester\AppData\Local")
+        monkeypatch.setenv("PROGRAMFILES", r"C:\Program Files")
+        monkeypatch.setenv("PROGRAMFILES(X86)", r"C:\Program Files (x86)")
+
+        search_dirs = _iter_wireshark_search_dirs()
+
+        assert r"C:\Program Files\Wireshark" in search_dirs
+        assert r"C:\Program Files (x86)\Wireshark" in search_dirs
+        assert r"C:\Users\tester\AppData\Local\Programs\Wireshark" in search_dirs

tests/test_server.py

@@ -0,0 +1,47 @@
+"""Tests for server bootstrap behavior."""
+
+import wireshark_mcp.server as server
+
+
+class TestWindowsEventLoop:
+    def test_configure_windows_event_loop_is_noop_off_windows(self, monkeypatch):
+        applied: list[object] = []
+
+        monkeypatch.setattr(server.sys, "platform", "darwin")
+        monkeypatch.setattr(server.asyncio, "set_event_loop_policy", lambda policy: applied.append(policy))
+
+        server._configure_windows_event_loop()
+
+        assert applied == []
+
+    def test_configure_windows_event_loop_sets_proactor_policy(self, monkeypatch):
+        class FakePolicy:
+            pass
+
+        applied: list[object] = []
+
+        monkeypatch.setattr(server.sys, "platform", "win32")
+        monkeypatch.setattr(server.asyncio, "WindowsProactorEventLoopPolicy", FakePolicy, raising=False)
+        monkeypatch.setattr(server.asyncio, "get_event_loop_policy", lambda: object())
+        monkeypatch.setattr(server.asyncio, "set_event_loop_policy", lambda policy: applied.append(policy))
+
+        server._configure_windows_event_loop()
+
+        assert len(applied) == 1
+        assert isinstance(applied[0], FakePolicy)
+
+    def test_configure_windows_event_loop_keeps_existing_proactor_policy(self, monkeypatch):
+        class FakePolicy:
+            pass
+
+        current_policy = FakePolicy()
+        applied: list[object] = []
+
+        monkeypatch.setattr(server.sys, "platform", "win32")
+        monkeypatch.setattr(server.asyncio, "WindowsProactorEventLoopPolicy", FakePolicy, raising=False)
+        monkeypatch.setattr(server.asyncio, "get_event_loop_policy", lambda: current_policy)
+        monkeypatch.setattr(server.asyncio, "set_event_loop_policy", lambda policy: applied.append(policy))
+
+        server._configure_windows_event_loop()
+
+        assert applied == []