FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: Replace remaining manual server polling with wait_for_server helper by maxisbey · Pull Request #1529 · modelcontextprotocol/python-sdk · GitHub

/ python-sdk Public

fix: Replace remaining manual server polling with wait_for_server helper #1529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxisbey merged 1 commit into from
Oct 29, 2025
Conversation 1 Commits 1 Checks 21 Files changed
Merged

fix: Replace remaining manual server polling with wait_for_server helper #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (4) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
17 changes: 3 additions & 14 deletions tests/client/test_http_unicode.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

import multiprocessing
import socket
import time
from collections.abc import Generator

import pytest

from mcp.client.session import ClientSession
from mcp.client.streamable_http import streamablehttp_client
from tests.test_helpers import wait_for_server

# Test constants with various Unicode characters
UNICODE_TEST_STRINGS = {
Expand Down Expand Up @@ -158,19 +158,8 @@ def running_unicode_server(unicode_server_port: int) -> Generator[str, None, Non
proc = multiprocessing.Process(target=run_unicode_server, kwargs={"port": unicode_server_port}, daemon=True)
proc.start()

# Wait for server to be running
max_attempts = 20
attempt = 0
while attempt < max_attempts:
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
s.connect(("127.0.0.1", unicode_server_port))
break
except ConnectionRefusedError:
time.sleep(0.1)
attempt += 1
else:
raise RuntimeError(f"Server failed to start after {max_attempts} attempts")
# Wait for server to be ready
wait_for_server(unicode_server_port)

try:
yield f"http://127.0.0.1:{unicode_server_port}"
Expand Down
13 changes: 4 additions & 9 deletions tests/client/test_notification_response.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import json
import multiprocessing
import socket
import time
from collections.abc import Generator

import pytest
Expand All @@ -22,6 +21,7 @@
from mcp.client.streamable_http import streamablehttp_client
from mcp.shared.session import RequestResponder
from mcp.types import ClientNotification, RootsListChangedNotification
from tests.test_helpers import wait_for_server


def create_non_sdk_server_app() -> Starlette:
Expand Down Expand Up @@ -95,14 +95,9 @@ def non_sdk_server(non_sdk_server_port: int) -> Generator[None, None, None]:
proc.start()

# Wait for server to be ready
start_time = time.time()
while time.time() - start_time < 10:
try:
with socket.create_connection(("127.0.0.1", non_sdk_server_port), timeout=0.1):
break
except (TimeoutError, ConnectionRefusedError):
time.sleep(0.1)
else:
try:
wait_for_server(non_sdk_server_port, timeout=10.0)
except TimeoutError:
proc.kill()
proc.join(timeout=2)
pytest.fail("Server failed to start within 10 seconds")
Expand Down
17 changes: 3 additions & 14 deletions tests/server/fastmcp/test_integration.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import json
import multiprocessing
import socket
import time
from collections.abc import Generator

import pytest
Expand Down Expand Up @@ -60,6 +59,7 @@
TextResourceContents,
ToolListChangedNotification,
)
from tests.test_helpers import wait_for_server


class NotificationCollector:
Expand Down Expand Up @@ -160,19 +160,8 @@ def server_transport(request: pytest.FixtureRequest, server_port: int) -> Genera
)
proc.start()

# Wait for server to be running
max_attempts = 20
attempt = 0
while attempt < max_attempts:
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
s.connect(("127.0.0.1", server_port))
break
except ConnectionRefusedError:
time.sleep(0.1)
attempt += 1
else:
raise RuntimeError(f"Server failed to start after {max_attempts} attempts")
# Wait for server to be ready
wait_for_server(server_port)

yield transport

Expand Down
26 changes: 2 additions & 24 deletions tests/shared/test_sse.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -252,19 +252,8 @@ def mounted_server(server_port: int) -> Generator[None, None, None]:
proc.start()

# Wait for server to be running
max_attempts = 20
attempt = 0
print("waiting for server to start")
while attempt < max_attempts:
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
s.connect(("127.0.0.1", server_port))
break
except ConnectionRefusedError:
time.sleep(0.1)
attempt += 1
else:
raise RuntimeError(f"Server failed to start after {max_attempts} attempts")
wait_for_server(server_port)

yield

Expand Down Expand Up @@ -367,19 +356,8 @@ def context_server(server_port: int) -> Generator[None, None, None]:
proc.start()

# Wait for server to be running
max_attempts = 20
attempt = 0
print("waiting for context server to start")
while attempt < max_attempts:
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
s.connect(("127.0.0.1", server_port))
break
except ConnectionRefusedError:
time.sleep(0.1)
attempt += 1
else:
raise RuntimeError(f"Context server failed to start after {max_attempts} attempts")
wait_for_server(server_port)

yield

Expand Down
Back | FazBrowse Home | New Git URL