Merge pull request DeusData#1067 from tmonestudio/codex/test-isolate-cache

fix(tests): isolate integration caches from user state

Author: DeusData

tests/test_lang_contract.c

@@ -71,13 +71,18 @@ static cbm_store_t *lang_open_indexed(LangProj *lp) {
     if (!lp->project) {
         return NULL;
     }
-    const char *home = getenv("HOME");
-    if (!home) {
-        home = "/tmp";
-    }
     char cache_dir[512];
-    snprintf(cache_dir, sizeof(cache_dir), "%s/.cache/codebase-memory-mcp", home);
-    cbm_mkdir(cache_dir);
+    const char *configured_cache = getenv("CBM_CACHE_DIR");
+    if (configured_cache && configured_cache[0]) {
+        snprintf(cache_dir, sizeof(cache_dir), "%s", configured_cache);
+    } else {
+        const char *home = getenv("HOME");
+        if (!home) {
+            home = "/tmp";
+        }
+        snprintf(cache_dir, sizeof(cache_dir), "%s/.cache/codebase-memory-mcp", home);
+    }
+    cbm_mkdir_p(cache_dir, 0755);
     snprintf(lp->dbpath, sizeof(lp->dbpath), "%s/%s.db", cache_dir, lp->project);
     unlink(lp->dbpath);
     lp->srv = cbm_mcp_server_new(NULL);

tests/test_main.c

@@ -9,6 +9,7 @@ int tf_fail_count = 0;
 int tf_skip_count = 0;
 
 #include "test_framework.h"
+#include "test_helpers.h"
 #include "foundation/compat.h"    /* cbm_setenv — #845 supervisor kill switch */
 #include "foundation/compat_fs.h" /* cbm_fopen — worker response file */
 #include "foundation/mem.h"       /* cbm_mem_init — worker budget */
@@ -24,6 +25,32 @@ int tf_skip_count = 0;
 #include <winsock2.h> /* #798 follow-up: socket-isolation re-exec probe */
 #endif
 
+/* Test handlers that exercise the production index_repository flow must never
+ * inherit the user's real cache. Individual tests may temporarily override
+ * this sentinel and restore it; atexit removes anything left behind by an
+ * assertion that returns before fixture cleanup. */
+static char tf_home_sentinel[512];
+
+static void tf_cleanup_cache_sentinel(void) {
+    if (tf_home_sentinel[0]) {
+        th_rmtree(tf_home_sentinel);
+    }
+}
+
+static bool tf_setup_cache_sentinel(void) {
+    snprintf(tf_home_sentinel, sizeof(tf_home_sentinel), "/tmp/cbm-test-home-XXXXXX");
+    if (!cbm_mkdtemp(tf_home_sentinel)) {
+        return false;
+    }
+    /* Legacy integration fixtures derive DB paths from HOME, while production
+     * cache_dir() prefers CBM_CACHE_DIR. A private HOME plus no inherited cache
+     * override keeps both conventions pointed at the same isolated tree. */
+    cbm_setenv("HOME", tf_home_sentinel, 1);
+    cbm_unsetenv("CBM_CACHE_DIR");
+    atexit(tf_cleanup_cache_sentinel);
+    return true;
+}
+
 /* #832 guard support: when the index supervisor spawns THIS binary as
  * `<self> cli --index-worker index_repository <args_json> --response-out <file>`
  * (exactly the argv cbm_index_spawn_worker builds), act as a faithful in-process
@@ -276,6 +303,10 @@ int main(int argc, char **argv) {
      * binary as `<self> cli --index-worker …` and recursively re-run suites.
      * A test that exercises the supervisor must explicitly re-enable it. */
     cbm_setenv("CBM_INDEX_SUPERVISOR", "0", 1);
+    if (!tf_setup_cache_sentinel()) {
+        fprintf(stderr, "failed to create isolated test cache\n");
+        return 2;
+    }
 
     g_suite_argc = argc;
     g_suite_argv = argv;