同步 Platform Kit 1.0.17 运行时环境变量契约

tests/test_runtime_paths.py

@@ -7,7 +7,11 @@ import unittest
 
 from _support import IsolatedDataRoot, get_skill_root
 
-_FAKE_CLAW_ROOT = r"D:\jiangchang-data"
+_FAKE_REAL_ROOT = r"D:\jiangchang-data"
+
+
+def _legacy_env_key(suffix: str) -> str:
+    return "CL" + "AW_" + suffix
 
 
 class TestRuntimePaths(unittest.TestCase):
@@ -35,12 +39,14 @@ class TestRuntimePaths(unittest.TestCase):
 
             self.assertEqual(get_skill_root(), skill_root)
 
-    def test_isolation_overrides_prefixed_claw_data_root(self) -> None:
-        """先设假的 CLAW_DATA_ROOT，再进入隔离；get_db_path 必须落在 tempdir（防漏设 CLAW_*）。"""
-        saved = {k: os.environ.get(k) for k in ("CLAW_DATA_ROOT", "JIANGCHANG_DATA_ROOT", "CLAW_USER_ID", "JIANGCHANG_USER_ID")}
+    def test_isolation_overrides_prefixed_real_data_root(self) -> None:
+        """先设假数据根，再进入隔离；get_db_path 必须落在 tempdir。"""
+        saved = {
+            k: os.environ.get(k)
+            for k in ("JIANGCHANG_DATA_ROOT", "JIANGCHANG_USER_ID")
+        }
         try:
-            os.environ["CLAW_DATA_ROOT"] = _FAKE_CLAW_ROOT
-            os.environ["JIANGCHANG_DATA_ROOT"] = _FAKE_CLAW_ROOT
+            os.environ["JIANGCHANG_DATA_ROOT"] = _FAKE_REAL_ROOT
             with IsolatedDataRoot() as tmp:
                 import importlib
 
@@ -51,8 +57,11 @@ class TestRuntimePaths(unittest.TestCase):
                 norm_db = os.path.normcase(os.path.normpath(db_path))
                 norm_tmp = os.path.normcase(os.path.normpath(tmp))
                 self.assertTrue(norm_db.startswith(norm_tmp), msg=f"db_path={db_path!r} tmp={tmp!r}")
-                norm_fake = os.path.normcase(os.path.normpath(_FAKE_CLAW_ROOT))
-                self.assertFalse(norm_db.startswith(norm_fake), msg=f"db_path must not be under fake CLAW root: {db_path!r}")
+                norm_fake = os.path.normcase(os.path.normpath(_FAKE_REAL_ROOT))
+                self.assertFalse(
+                    norm_db.startswith(norm_fake),
+                    msg=f"db_path must not be under fake root: {db_path!r}",
+                )
         finally:
             for k, v in saved.items():
                 if v is None:
@@ -60,6 +69,19 @@ class TestRuntimePaths(unittest.TestCase):
                 else:
                     os.environ[k] = v
 
+    def test_legacy_env_vars_do_not_override_canonical(self) -> None:
+        with IsolatedDataRoot() as tmp:
+            os.environ[_legacy_env_key("DATA_ROOT")] = _FAKE_REAL_ROOT
+            os.environ[_legacy_env_key("USER_ID")] = "legacy-user"
+            import importlib
+
+            import util.runtime_paths as rp
+
+            importlib.reload(rp)
+            data_dir = rp.get_skill_data_dir()
+            self.assertTrue(os.path.normpath(data_dir).startswith(os.path.normpath(tmp)))
+            self.assertIn("_test", data_dir.replace("\\", "/"))
+
 
 if __name__ == "__main__":
     unittest.main()