fix smoke test fail

Author: whisper67265

tests/integration/conftest.py

@@ -13,7 +13,7 @@
 import pytest
 
 from tests.integration.lib.docker_exec import docker_exec_python, docker_exec_read_file
-from tests.integration.lib.gh_repo import TestRepoManager, default_repo_name
+from tests.integration.lib.gh_repo import EphemeralGitHubRepo, default_repo_name
 from tests.integration.lib.http import base_url
 from tests.integration.lib.weblate_api import WeblateAPI
 
@@ -55,14 +55,14 @@ def weblate_ssh_pubkey() -> str:
 
 
 @pytest.fixture(scope="session")
-def test_repo(weblate_ssh_pubkey: str) -> TestRepoManager:
+def test_repo(weblate_ssh_pubkey: str) -> EphemeralGitHubRepo:
     """Ephemeral GitHub repo with fixture docs and Weblate deploy key."""
     token = os.environ.get("GH_TEST_REPO_TOKEN", "").strip()
     if not token:
         pytest.skip("GH_TEST_REPO_TOKEN is not set")
 
     repo_name = default_repo_name()
-    manager = TestRepoManager(token, repo_name)
+    manager = EphemeralGitHubRepo(token, repo_name)
     try:
         manager.create_repo()
         manager.push_fixtures(FIXTURES_DIR, branch=TEST_BRANCH)

tests/integration/lib/docker_exec.py

@@ -16,6 +16,16 @@
 _PYTHON = "/app/venv/bin/python"
 
 
+def _weblate_django_preamble() -> str:
+    """Weblate format modules need a configured Django app registry."""
+    return (
+        "import os; "
+        'os.environ.setdefault("DJANGO_SETTINGS_MODULE", "weblate.settings_docker"); '
+        "import django; "
+        "django.setup(); "
+    )
+
+
 def _compose_cmd(*args: str) -> list[str]:
     return [
         "docker",
@@ -28,10 +38,12 @@ def _compose_cmd(*args: str) -> list[str]:
     ]
 
 
-def docker_exec_python(snippet: str) -> str:
+def docker_exec_python(snippet: str, *, timeout: float = 120.0) -> str:
     """Run a Python snippet in the weblate container; return stdout (stripped)."""
+    code = _weblate_django_preamble() + snippet
     result = subprocess.run(
-        _compose_cmd("exec", "-T", "weblate", _PYTHON, "-c", snippet),
+        _compose_cmd("exec", "-T", "weblate", _PYTHON, "-c", code),
+        timeout=timeout,
         capture_output=True,
         text=True,
         check=False,
@@ -45,9 +57,9 @@ def docker_exec_python(snippet: str) -> str:
     return result.stdout.strip()
 
 
-def docker_exec_python_json(snippet: str) -> Any:
+def docker_exec_python_json(snippet: str, *, timeout: float = 120.0) -> Any:
     """Run a Python snippet and parse stdout as JSON."""
-    return json.loads(docker_exec_python(snippet))
+    return json.loads(docker_exec_python(snippet, timeout=timeout))
 
 
 def docker_exec_read_file(path: str) -> str:

tests/integration/lib/gh_repo.py

@@ -22,9 +22,11 @@ def _api_error_message(method: str, path: str, code: int, raw: bytes) -> str:
     return f"GitHub API {method} {path} failed: {code} {body}"
 
 
-class TestRepoManager:
+class EphemeralGitHubRepo:
     """Create, populate, and destroy a temporary GitHub repo for integration tests."""
 
+    __test__ = False  # not a pytest test class
+
     def __init__(self, token: str, repo_name: str) -> None:
         self.token = token
         self.repo_name = repo_name

tests/integration/lib/weblate_api.py

@@ -67,7 +67,11 @@ def create_project(self, name: str, slug: str | None = None) -> dict[str, Any]:
             "POST",
             "/api/projects/",
             token=self.token,
-            body={"name": name, "slug": slug},
+            body={
+                "name": name,
+                "slug": slug,
+                "web": f"{self._base}/",
+            },
         )
         assert code == 200, f"create_project failed: {code} {body}"
         assert isinstance(body, dict)
@@ -225,13 +229,8 @@ def poll_celery_task(
         deadline = time.monotonic() + timeout
         snippet_template = """
 import json
-import os
 import time
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "weblate.settings_docker")
-import django
-django.setup()
-
 from celery.result import AsyncResult
 from weblate.utils.celery import app
 
@@ -260,7 +259,7 @@ def poll_celery_task(
                 interval=interval,
             )
             try:
-                out = docker_exec_python(snippet)
+                out = docker_exec_python(snippet, timeout=timeout)
                 data = json.loads(out)
                 return data.get("result")
             except (RuntimeError, json.JSONDecodeError, TimeoutError) as exc:

tests/integration/test_functional.py

@@ -20,7 +20,7 @@
     TEST_LANG_CODE,
     TEST_VERSION,
 )
-from tests.integration.lib.gh_repo import TestRepoManager
+from tests.integration.lib.gh_repo import EphemeralGitHubRepo
 from tests.integration.lib.http import http_json
 from tests.integration.lib.weblate_api import WeblateAPI
 
@@ -115,7 +115,7 @@ class TestBoostComponentServiceE2E:
 
     @staticmethod
     def _service_snippet(
-        test_repo: TestRepoManager,
+        test_repo: EphemeralGitHubRepo,
         *,
         run_process_all: bool = False,
         run_twice: bool = False,
@@ -185,7 +185,7 @@ def _service_snippet(
 print(json.dumps(out))
 """
 
-    def test_clone_and_scan(self, exec_python, test_repo: TestRepoManager) -> None:
+    def test_clone_and_scan(self, exec_python, test_repo: EphemeralGitHubRepo) -> None:
         out = json.loads(
             exec_python(self._service_snippet(test_repo, run_process_all=False))
         )
@@ -195,7 +195,7 @@ def test_clone_and_scan(self, exec_python, test_repo: TestRepoManager) -> None:
         assert any(c["format"] == "asciidoc" for c in out["configs"])
 
     def test_project_component_creation(
-        self, exec_python, test_repo: TestRepoManager
+        self, exec_python, test_repo: EphemeralGitHubRepo
     ) -> None:
         """Direct process_all on a DB with no prior components for this repo."""
         out = json.loads(
@@ -220,7 +220,7 @@ def test_project_component_creation(
         )
         assert check == "ok"
 
-    def test_idempotency(self, exec_python, test_repo: TestRepoManager) -> None:
+    def test_idempotency(self, exec_python, test_repo: EphemeralGitHubRepo) -> None:
         out = json.loads(
             exec_python(
                 self._service_snippet(test_repo, run_process_all=True, run_twice=True)
@@ -239,7 +239,7 @@ class TestAddOrUpdateCeleryFlow:
     """POST /boost-endpoint/add-or-update/ and poll Celery completion."""
 
     def test_add_or_update_returns_202(
-        self, api_token: str, test_repo: TestRepoManager
+        self, api_token: str, test_repo: EphemeralGitHubRepo
     ) -> None:
         owner = test_repo.resolve_owner()
         body = {
@@ -260,7 +260,7 @@ def test_add_or_update_returns_202(
         type(self).task_id = str(data["task_id"])
 
     def test_add_or_update_task_completes(
-        self, weblate_api: WeblateAPI, test_repo: TestRepoManager
+        self, weblate_api: WeblateAPI, test_repo: EphemeralGitHubRepo
     ) -> None:
         task_id = getattr(self, "task_id", None)
         if not task_id: