svn commit: r1937025 - in httpd/httpd/trunk/test/pytest_suite: apache_pytest t/conf tests/t/modules

Author: jorton
Date: Mon Aug 10 10:25:29 2026
New Revision: 1937025

Log:
* 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 <[email protected]>
GitHub: PR #701

Modified:
   httpd/httpd/trunk/test/pytest_suite/apache_pytest/config.py
   httpd/httpd/trunk/test/pytest_suite/t/conf/cache.conf.in
   httpd/httpd/trunk/test/pytest_suite/tests/t/modules/test_cache.py

Modified: httpd/httpd/trunk/test/pytest_suite/apache_pytest/config.py
==============================================================================
--- httpd/httpd/trunk/test/pytest_suite/apache_pytest/config.py	Mon Aug 10 08:46:42 2026	(r1937024)
+++ httpd/httpd/trunk/test/pytest_suite/apache_pytest/config.py	Mon Aug 10 10:25:29 2026	(r1937025)
@@ -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")

Modified: httpd/httpd/trunk/test/pytest_suite/t/conf/cache.conf.in
==============================================================================
--- httpd/httpd/trunk/test/pytest_suite/t/conf/cache.conf.in	Mon Aug 10 08:46:42 2026	(r1937024)
+++ httpd/httpd/trunk/test/pytest_suite/t/conf/cache.conf.in	Mon Aug 10 10:25:29 2026	(r1937025)
@@ -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
 

Modified: httpd/httpd/trunk/test/pytest_suite/tests/t/modules/test_cache.py
==============================================================================
--- httpd/httpd/trunk/test/pytest_suite/tests/t/modules/test_cache.py	Mon Aug 10 08:46:42 2026	(r1937024)
+++ httpd/httpd/trunk/test/pytest_suite/tests/t/modules/test_cache.py	Mon Aug 10 10:25:29 2026	(r1937025)
@@ -18,7 +18,7 @@ from apache_pytest import need_min_apach
 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/")