π The fast, Pythonic way to build MCP servers and clients.
Improve rate limit detection for integration tests
Chris Guidrya8bbd745fe48
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.ymlindex 5c6d4d892..a3fb99999 100644--- a/.github/workflows/run-tests.yml+++ b/.github/workflows/run-tests.yml@@ -99,8 +99,8 @@ jobs:run: uv sync --upgrade- name: Run integration tests- # use longer per-test timeout than the default 3s- run: uv run pytest tests -m "integration" --timeout=15 --numprocesses auto --maxprocesses 2 --dist worksteal+ # use longer per-test timeout for remote API calls (default is 5s)+ run: uv run pytest tests -m "integration" --timeout=30 --numprocesses auto --maxprocesses 2 --dist workstealenv:FASTMCP_GITHUB_TOKEN: ${{ secrets.FASTMCP_GITHUB_TOKEN }}FASTMCP_TEST_AUTH_GITHUB_CLIENT_ID: ${{ secrets.FASTMCP_TEST_AUTH_GITHUB_CLIENT_ID }}diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.pyindex 4be7f6a9e..8bcdb9eca 100644--- a/tests/integration_tests/conftest.py+++ b/tests/integration_tests/conftest.py@@ -3,8 +3,13 @@ import osimport pytest-def _is_rate_limit_error(excinfo) -> bool:- """Check if an exception indicates a rate limit error from GitHub API."""+def _is_rate_limit_error(excinfo, report=None) -> bool:+ """Check if an exception indicates a rate limit error from GitHub API.++ Args:+ excinfo: The exception info from pytest+ report: Optional test report for additional context (captured output, longrepr)+ """if excinfo is None:return False@@ -28,6 +33,20 @@ def _is_rate_limit_error(excinfo) -> bool:if "429" in exc_str or "rate limit" in exc_str or "too many requests" in exc_str:return True+ # Timeout exceptions may indicate rate limiting when the 429 causes asyncio+ # shutdown issues. Check if it's a timeout and look for 429 in the captured output.+ if "timeout" in exc_type.lower() or "timeout" in exc_str:+ # Check captured output for 429 indicators+ if report is not None:+ longrepr_str = str(report.longrepr).lower() if report.longrepr else ""+ if "429" in longrepr_str or "too many requests" in longrepr_str:+ return True++ # Check captured stdout/stderr+ for section_name, content in getattr(report, "sections", []):+ if "429" in content or "too many requests" in content.lower():+ return True+return False@@ -43,7 +62,7 @@ def pytest_runtest_makereport(item, call):and report.failedand not hasattr(report, "wasxfail")and item.module.__name__ == "tests.integration_tests.test_github_mcp_remote"- and _is_rate_limit_error(call.excinfo)+ and _is_rate_limit_error(call.excinfo, report)):report.outcome = "skipped"report.longrepr = (