* test/pytest_suite/apache_pytest/config.py (_build_vars): Add

  @STATEDIR@ config template variable.

* test/pytest_suite/t/conf/cache.conf.in, tests/t/modules/test_cache.py:
  Use @STATEDIR@/cacheroot/ for CacheRoot, instead of t/conf/cacheroot.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1937025 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/pytest_suite/apache_pytest/config.py b/test/pytest_suite/apache_pytest/config.py
index 07939d3d235ea3495ed8851d3dbb74d52d1f5c12..3e362be077f2ab091c4b3db4431d5374ca986caa 100644 (file)
--- a/test/pytest_suite/apache_pytest/config.py
+++ b/test/pytest_suite/apache_pytest/config.py
@@ -295,6 +295,7 @@ class TestConfig:
         v["t_conf"] = str(serverroot / "conf")
         v["t_logs"] = str(serverroot / "logs")
         v["t_state"] = str(serverroot / "state")
+        v["statedir"] = v["t_state"]
         v["t_conf_file"] = str(serverroot / "conf" / "httpd.conf")
         v["t_pid_file"] = str(serverroot / "logs" / "httpd.pid")
         v["sslca"] = str(serverroot / "conf" / "ssl" / "ca")

diff --git a/test/pytest_suite/t/conf/cache.conf.in b/test/pytest_suite/t/conf/cache.conf.in
index fa06db72ebb5b4b11408f609c6f7e3293fb7dc9f..91284d136443dc1a0dde0c1ebd37143245e37adc 100644 (file)
--- a/test/pytest_suite/t/conf/cache.conf.in
+++ b/test/pytest_suite/t/conf/cache.conf.in
@@ -7,7 +7,7 @@
     <IfModule mod_disk_cache.c>
 
             CacheEnable    disk /cache/
-            CacheRoot      @SERVERROOT@/conf/cacheroot/ 
+            CacheRoot      @STATEDIR@/cacheroot/
             CacheDirLevels 1
             CacheDirLength 1
 
@@ -15,7 +15,7 @@
    <IfModule mod_cache_disk.c>
 
             CacheEnable    disk /cache/
-            CacheRoot      @SERVERROOT@/conf/cacheroot/ 
+            CacheRoot      @STATEDIR@/cacheroot/
             CacheDirLevels 1
             CacheDirLength 1
 

diff --git a/test/pytest_suite/tests/t/modules/test_cache.py b/test/pytest_suite/tests/t/modules/test_cache.py
index 071fec3ba70f0d440e998b718d3a3984acd1658b..76f10b107a7ffb167c758ee1be4070af6c3d167a 100644 (file)
--- a/test/pytest_suite/tests/t/modules/test_cache.py
+++ b/test/pytest_suite/tests/t/modules/test_cache.py
@@ -18,7 +18,7 @@ from apache_pytest import need_min_apache_version, need_module, t_cmp
 def test_cache(http):
     http.module("mod_cache")
 
-    cacheroot = os.path.join(http.vars("serverroot"), "conf", "cacheroot")
+    cacheroot = os.path.join(http.vars("statedir"), "cacheroot")
     os.makedirs(cacheroot, exist_ok=True)
 
     r = http.GET("/cache/")