Fix _ensure_test_user catching only NextcloudError, not TimeoutError/OSError

Author: bigcat88

tests/integration/test_user_permissions.py

@@ -5,12 +5,14 @@
 errors instead of crashing or leaking data.
 """
 
+import asyncio
 import json
 import os
 from collections.abc import AsyncGenerator
 
 import pytest
 from mcp.server.fastmcp.exceptions import ToolError
+from urllib3.exceptions import MaxRetryError
 
 from nc_mcp_server.client import NextcloudClient, NextcloudError
 from nc_mcp_server.config import Config
@@ -28,17 +30,33 @@
 
 @pytest.fixture(scope="module")
 async def _ensure_test_user() -> None:
-    """Create the test user via admin client if it doesn't exist."""
+    """Create the test user via admin client if it doesn't exist.
+
+    Retries the entire operation to handle slow container startup in CI.
+    The niquests/urllib3 stack may raise TimeoutError, OSError, or
+    urllib3.exceptions.MaxRetryError (which is none of the above),
+    so we catch Exception and retry on any connection-level failure.
+    """
     admin_config = Config(
         nextcloud_url=os.environ.get("NEXTCLOUD_URL", "http://nextcloud.ncmcp"),
         user=os.environ.get("NEXTCLOUD_USER", "admin"),
         password=os.environ.get("NEXTCLOUD_PASSWORD", "admin"),
     )
     client = NextcloudClient(admin_config)
-    try:
-        await client.ocs_get(f"cloud/users/{TEST_USER}")
-    except NextcloudError:
-        await client.ocs_post("cloud/users", data={"userid": TEST_USER, "password": TEST_PASS})
+    last_err: Exception | None = None
+    for attempt in range(10):
+        try:
+            await client.ocs_get(f"cloud/users/{TEST_USER}")
+            break
+        except NextcloudError:
+            await client.ocs_post("cloud/users", data={"userid": TEST_USER, "password": TEST_PASS})
+            break
+        except (OSError, TimeoutError, MaxRetryError) as exc:
+            last_err = exc
+            if attempt < 9:
+                await asyncio.sleep(3)
+                continue
+            raise last_err from exc
     await client.close()