chore: improve packaging, pytest path, and server startup tests (#242)

* updating the codebase to use the new MCP server startup mechanism. This includes changes to the unit and e2e tests to reflect the new server parameters and startup process. The tests have been modified to ensure they are compatible with the updated server initialization logic.

* code updated as per feedback receievd

* cleaned up code

---------

Co-authored-by: Vedant Walia <vedantwalia@outlook.com>

Author: Taxuspt

.gitignore

@@ -12,6 +12,7 @@ build/
 # Virtual environments
 .env
 .venv/
+.uv-cache/
 *.log
 .DS_Store
 .claude.md

pyproject.toml

@@ -22,6 +22,9 @@ dependencies = [
 garmin-mcp = "garmin_mcp:main"
 garmin-mcp-auth = "garmin_mcp.auth_cli:main"
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/garmin_mcp"]
+
 [tool.uv]
 dev-dependencies = [
     "pytest>=9.0.2",

pytest.ini

@@ -8,6 +8,7 @@ python_functions = test_*
 
 # Test paths
 testpaths = tests
+pythonpath = src
 
 # Minimum version
 minversion = 7.0

tests/e2e/test_server_e2e.py

@@ -13,6 +13,8 @@
 Or skip with: pytest -m "not e2e"
 """
 
+import os
+import sys
 import pytest
 import asyncio
 from datetime import datetime
@@ -27,6 +29,22 @@
 load_dotenv()
 
 
+def _build_server_params():
+    """Construct MCP server parameters using the active Python interpreter."""
+    env = os.environ.copy()
+    repo_root = Path(__file__).resolve().parents[2]
+    src_path = repo_root / "src"
+    if str(src_path) not in env.get("PYTHONPATH", ""):
+        env["PYTHONPATH"] = os.pathsep.join(
+            filter(None, [str(src_path), env.get("PYTHONPATH", "")])
+        )
+    return StdioServerParameters(
+        command=sys.executable,
+        args=["-m", "garmin_mcp"],
+        env=env,
+    )
+
+
 @pytest.mark.e2e
 @pytest.mark.asyncio
 @pytest.mark.timeout(30)  # Pytest timeout
@@ -39,11 +57,7 @@ async def test_mcp_server_connection():
     - May require MFA code input if tokens are expired
     """
     # Use python module execution instead of direct script path
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,  # Uses current environment which includes .env variables
-    )
+    server_params = _build_server_params()
 
     # Connect to server with timeout
     try:
@@ -77,11 +91,7 @@ async def test_mcp_server_connection():
 @pytest.mark.timeout(30)
 async def test_list_activities_tool():
     """Test the list_activities MCP tool with real API"""
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,
-    )
+    server_params = _build_server_params()
 
     try:
         async with asyncio.timeout(20):
@@ -111,11 +121,7 @@ async def test_list_activities_tool():
 @pytest.mark.timeout(30)
 async def test_get_steps_data_tool():
     """Test the get_steps_data MCP tool with real API"""
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,
-    )
+    server_params = _build_server_params()
 
     try:
         async with asyncio.timeout(20):
@@ -147,11 +153,7 @@ async def test_get_steps_data_tool():
 @pytest.mark.timeout(45)
 async def test_multiple_tools():
     """Test multiple MCP tools in a single session"""
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,
-    )
+    server_params = _build_server_params()
 
     try:
         async with asyncio.timeout(40):
@@ -202,11 +204,7 @@ async def test_schedule_workouts_tool():
     import os
     import json
 
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,
-    )
+    server_params = _build_server_params()
 
     workout_ids_env = os.environ.get("GARMIN_TEST_WORKOUT_IDS", "")
     dates_env = os.environ.get("GARMIN_TEST_SCHEDULE_DATES", "")
@@ -265,11 +263,7 @@ async def test_upload_workouts_tool():
     """
     import json
 
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,
-    )
+    server_params = _build_server_params()
 
     minimal_workout = {
         "workoutName": "e2e Test Workout - DELETE ME",
@@ -343,11 +337,7 @@ async def test_delete_workouts_tool():
     """
     import json
 
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,
-    )
+    server_params = _build_server_params()
 
     try:
         async with asyncio.timeout(50):
@@ -393,11 +383,7 @@ async def test_schedule_workouts_inline_upload():
     """
     import json
 
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,
-    )
+    server_params = _build_server_params()
 
     inline_workout = {
         "workoutName": "e2e Inline Test - DELETE ME",
@@ -471,11 +457,7 @@ async def test_schedule_workouts_missing_required_fields():
     """
     import json
 
-    server_params = StdioServerParameters(
-        command="python",
-        args=["-m", "garmin_mcp"],
-        env=None,
-    )
+    server_params = _build_server_params()
 
     try:
         async with asyncio.timeout(50):

tests/unit/test_project_dependencies.py

@@ -0,0 +1,11 @@
+"""Project metadata regression tests."""
+
+from pathlib import Path
+
+
+def test_project_caps_mcp_to_v1_series() -> None:
+    """The project should explicitly stay on the MCP v1 series for compatibility."""
+    repo_root = Path(__file__).resolve().parents[2]
+    pyproject_text = (repo_root / "pyproject.toml").read_text()
+
+    assert '"mcp>=1.28.1,<2"' in pyproject_text

tests/unit/test_server_startup.py

@@ -0,0 +1,37 @@
+"""Startup smoke tests for the packaged MCP server."""
+
+import asyncio
+from unittest.mock import Mock
+
+import garmin_mcp
+from mcp.server.fastmcp import FastMCP
+
+
+def test_main_registers_tools_and_starts_stdio(monkeypatch):
+    """Run main() without real Garmin auth and stop before entering the server loop."""
+    run_calls = []
+
+    monkeypatch.delenv("GARMIN_MCP_TRANSPORT", raising=False)
+    monkeypatch.delenv("GARMIN_MCP_HOST", raising=False)
+    monkeypatch.delenv("GARMIN_MCP_PORT", raising=False)
+    monkeypatch.setattr(garmin_mcp, "init_api", lambda _email, _password: Mock())
+
+    def capture_run(self, **kwargs):
+        tools = asyncio.run(self.list_tools())
+        run_calls.append(
+            {
+                "transport": kwargs.get("transport"),
+                "tool_count": len(tools),
+                "tool_names": [tool.name for tool in tools],
+            }
+        )
+
+    monkeypatch.setattr(FastMCP, "run", capture_run)
+
+    garmin_mcp.main()
+
+    assert run_calls
+    assert run_calls[0]["transport"] == "stdio"
+    assert run_calls[0]["tool_count"] >= 10
+    assert "get_devices" in run_calls[0]["tool_names"]
+    assert "get_workouts" in run_calls[0]["tool_names"]