From 5650875dfef8f39579dc9a415e289be8e98f3dde Mon Sep 17 00:00:00 2001 From: autonomic-bot Date: Mon, 1 Jun 2026 19:42:22 +0000 Subject: [PATCH] fix(tests): follow custom-html docroot move --- tests/custom-html/functional/test_content_roundtrip.py | 4 ++-- tests/custom-html/functional/test_content_type_header.py | 2 +- tests/custom-html/ops.py | 4 ++-- tests/custom-html/test_backup.py | 2 +- tests/custom-html/test_restore.py | 2 +- tests/custom-html/test_upgrade.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/custom-html/functional/test_content_roundtrip.py b/tests/custom-html/functional/test_content_roundtrip.py index c3a8b5f..2e08963 100644 --- a/tests/custom-html/functional/test_content_roundtrip.py +++ b/tests/custom-html/functional/test_content_roundtrip.py @@ -23,11 +23,11 @@ def test_content_roundtrip(live_app): exact bytes round-trip. Non-vacuous: a stale page or misrouted backend would not return our randomly-generated content.""" marker = f"ccci-roundtrip-{uuid.uuid4().hex}" - # written into the served volume; nginx routes / to /usr/share/nginx/html/ + # written into the served volume; nginx routes / to /srv/www/html/ filename = f"ccci-roundtrip-{uuid.uuid4().hex[:12]}.txt" lifecycle.exec_in_app( live_app, - ["sh", "-c", f"printf %s {marker} > /usr/share/nginx/html/{filename}"], + ["sh", "-c", f"printf %s {marker} > /srv/www/html/{filename}"], ) url = f"https://{live_app}/{filename}" diff --git a/tests/custom-html/functional/test_content_type_header.py b/tests/custom-html/functional/test_content_type_header.py index 64c2fd9..8630ec2 100644 --- a/tests/custom-html/functional/test_content_type_header.py +++ b/tests/custom-html/functional/test_content_type_header.py @@ -40,7 +40,7 @@ def test_content_type_html_and_txt(live_app): body = "hello" for name in (html_name, txt_name): lifecycle.exec_in_app( - live_app, ["sh", "-c", f"printf %s {body} > /usr/share/nginx/html/{name}"] + live_app, ["sh", "-c", f"printf %s {body} > /srv/www/html/{name}"] ) s_html, h_html = _head(f"https://{live_app}/{html_name}") diff --git a/tests/custom-html/ops.py b/tests/custom-html/ops.py index 9c7b349..e729173 100644 --- a/tests/custom-html/ops.py +++ b/tests/custom-html/ops.py @@ -1,7 +1,7 @@ """custom-html — pre-op seed hooks (Phase 1e HC3). The orchestrator runs `pre_(domain, meta)` BEFORE it performs the op; the matching test_.py asserts the post-op state (assertion-only). -nginx serves the volume at /usr/share/nginx/html, so the marker file survives an upgrade / a +nginx serves the volume at /srv/www/html, so the marker file survives an upgrade / a backup+restore of that volume and is both HTTP-readable and exec-readable.""" import os @@ -10,7 +10,7 @@ import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner")) from harness import lifecycle # noqa: E402 -MARKER_PATH = "/usr/share/nginx/html/ci-marker.txt" +MARKER_PATH = "/srv/www/html/ci-marker.txt" def _write(domain: str, val: str) -> None: diff --git a/tests/custom-html/test_backup.py b/tests/custom-html/test_backup.py index e645bc1..22ee74d 100644 --- a/tests/custom-html/test_backup.py +++ b/tests/custom-html/test_backup.py @@ -12,7 +12,7 @@ import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner")) from harness import lifecycle # noqa: E402 -MARKER_PATH = "/usr/share/nginx/html/ci-marker.txt" +MARKER_PATH = "/srv/www/html/ci-marker.txt" def test_backup_captures_state(live_app): diff --git a/tests/custom-html/test_restore.py b/tests/custom-html/test_restore.py index e7316dc..43cbd89 100644 --- a/tests/custom-html/test_restore.py +++ b/tests/custom-html/test_restore.py @@ -12,7 +12,7 @@ import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner")) from harness import lifecycle # noqa: E402 -MARKER_PATH = "/usr/share/nginx/html/ci-marker.txt" +MARKER_PATH = "/srv/www/html/ci-marker.txt" def test_restore_returns_state(live_app): diff --git a/tests/custom-html/test_upgrade.py b/tests/custom-html/test_upgrade.py index 01be9bf..8a64b3b 100644 --- a/tests/custom-html/test_upgrade.py +++ b/tests/custom-html/test_upgrade.py @@ -11,7 +11,7 @@ import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner")) from harness import lifecycle # noqa: E402 -MARKER_PATH = "/usr/share/nginx/html/ci-marker.txt" +MARKER_PATH = "/srv/www/html/ci-marker.txt" def test_upgrade_preserves_data(live_app):