Merge pull request #150 from IBM/fix-smoketest

Fix smoketest

Author: crivetimihai

mcpgateway/services/gateway_service.py

@@ -589,7 +589,7 @@ async def check_health_of_gateways(self, gateways: List[DbGateway]) -> bool:
                     # Mark successful check
                     gateway.last_seen = datetime.utcnow()
 
-                except Exception as e:
+                except Exception:
                     await self._handle_gateway_failure(gateway)
 
         # All gateways passed

smoketest.py

@@ -153,13 +153,13 @@ def port_open(port: int, host="127.0.0.1", timeout=1.0) -> bool:
         return s.connect_ex((host, port)) == 0
 
 
-def wait_http_ok(url: str, timeout: int = 30) -> bool:
+def wait_http_ok(url: str, timeout: int = 30, *, headers: dict | None = None) -> bool:
     import requests
 
     end = time.time() + timeout
     while time.time() < end:
         try:
-            if requests.get(url, timeout=2, verify=False).status_code == 200:
+            if requests.get(url, timeout=2, verify=False, headers=headers).status_code == 200:
                 return True
         except requests.RequestException:
             pass
@@ -174,14 +174,27 @@ def wait_http_ok(url: str, timeout: int = 30) -> bool:
 
 
 def generate_jwt() -> str:
-    return (
-        subprocess.check_output(
-            ["docker", "exec", DOCKER_CONTAINER, "python3", "-m", "mcpgateway.utils.create_jwt_token", "--username", "admin", "--exp", "300", "--secret", "my-test-key"],
-            text=True,
-        )
-        .strip()
-        .strip('"')
-    )
+    """
+    Create a short-lived admin JWT that matches the gateway's settings.
+    Resolution order → environment-variable override, then package defaults.
+    """
+    user   = os.getenv("BASIC_AUTH_USER", "admin")
+    secret = os.getenv("JWT_SECRET_KEY", "my-test-key")
+    expiry = os.getenv("TOKEN_EXPIRY", "300")          # seconds
+
+    cmd = [
+        "docker",
+        "exec",
+        DOCKER_CONTAINER,
+        "python3",
+        "-m",
+        "mcpgateway.utils.create_jwt_token",
+        "--username", user,
+        "--exp",      expiry,
+        "--secret",   secret,
+    ]
+    return subprocess.check_output(cmd, text=True).strip().strip('"')
+
 
 
 def request(method: str, path: str, *, json_data=None, **kw):
@@ -238,11 +251,19 @@ def step_3_docker_build():
 
 def step_4_docker_run():
     sh(MAKE_DOCKER_RUN, "4️⃣  Run Docker container (HTTPS)")
-    # wait until gateway exposes the basic endpoints
+
+    # Build one token and reuse it for the health probes below.
+    token        = generate_jwt()
+    auth_headers = {"Authorization": f"Bearer {token}"}
+
+    # Probe endpoints until they respond with 200.
     for ep in ("/health", "/ready", "/version"):
-        full = f"https://localhost:{PORT_GATEWAY}{ep}"
-        if not wait_http_ok(full, 45):
+        full      = f"https://localhost:{PORT_GATEWAY}{ep}"
+        need_auth = os.getenv("AUTH_REQUIRED", "true").lower() == "true"
+        headers   = auth_headers if (ep == "/version" or need_auth) else None
+        if not wait_http_ok(full, 45, headers=headers):
             raise RuntimeError(f"Gateway endpoint {ep} not ready")
+
     logging.info("✅ Gateway /health /ready /version all OK")
 
 

tests/unit/mcpgateway/handlers/test_sampling.py

@@ -18,8 +18,6 @@
 
 from __future__ import annotations
 
-import asyncio
-from types import SimpleNamespace
 from typing import List
 
 import pytest

tests/unit/mcpgateway/services/test_gateway_service.py

@@ -15,7 +15,7 @@
 from __future__ import annotations
 
 from datetime import datetime, timezone
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, Mock
 
 import pytest
 

tests/unit/mcpgateway/services/test_prompt_service.py

@@ -14,10 +14,8 @@
 
 from __future__ import annotations
 
-import asyncio
 from datetime import datetime, timezone
-from string import Formatter
-from typing import Any, Dict, List, Optional
+from typing import Any, List, Optional
 from unittest.mock import AsyncMock, MagicMock, Mock
 
 import pytest
@@ -27,11 +25,10 @@
 from mcpgateway.schemas import PromptCreate, PromptRead, PromptUpdate
 from mcpgateway.services.prompt_service import (
     PromptError,
-    PromptNameConflictError,
     PromptNotFoundError,
     PromptService,
 )
-from mcpgateway.types import LogLevel, Message, PromptResult, Role, TextContent
+from mcpgateway.types import Message, PromptResult, Role
 
 # ---------------------------------------------------------------------------
 # helpers

tests/unit/mcpgateway/services/test_resource_service.py

@@ -16,7 +16,6 @@
     ResourceError,
     ResourceNotFoundError,
     ResourceService,
-    ResourceURIConflictError,
 )
 
 

tests/unit/mcpgateway/services/test_server_service.py

@@ -7,10 +7,9 @@
 Tests for server service implementation.
 """
 
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, Mock
 
 import pytest
-from sqlalchemy.exc import IntegrityError
 
 from mcpgateway.db import Prompt as DbPrompt
 from mcpgateway.db import Resource as DbResource

tests/unit/mcpgateway/services/test_tool_service.py

@@ -18,7 +18,6 @@
 from mcpgateway.services.tool_service import (
     ToolError,
     ToolInvocationError,
-    ToolNameConflictError,
     ToolNotFoundError,
     ToolService,
 )

tests/unit/mcpgateway/test_admin.py

@@ -56,7 +56,6 @@
 from mcpgateway.services.gateway_service import GatewayService
 from mcpgateway.services.prompt_service import PromptService
 from mcpgateway.services.resource_service import ResourceService
-from mcpgateway.services.root_service import RootService
 from mcpgateway.services.server_service import ServerNotFoundError, ServerService
 from mcpgateway.services.tool_service import (
     ToolNameConflictError,

tests/unit/mcpgateway/test_cli.py

@@ -16,9 +16,7 @@
 
 from __future__ import annotations
 
-import importlib
 import sys
-from pathlib import Path
 from typing import Any, Dict, List
 
 import pytest