guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f2: fix nix fixture store setup

Browse Source 
log dir and state dir are not taken from the environment if root is set.

Change-Id: I3752dcf7ac81b291e61beafbb3fed9601e3cfcd1
This commit is contained in:
eldritch horrors
2026-07-17 13:33:19 +00:00
parent ece46d54c7
commit 93ca179023
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/functional2/testlib/fixtures/nix.py
+2 -2
View File
@@ -194,7 +194,7 @@ class Nix:
"""
if self._settings is None:
self._settings = NixSettings()
self._settings.store = f"local?root={self.env.dirs.test_root}"
self._settings.store = f"local?root={self.env.dirs.test_root}&log={self.env.dirs.nix_log_dir}&state={self.env.dirs.nix_state_dir}"
if sys.platform == "linux":
# sandbox build dir cannot be withing store dir. choose a short non-overlapping path.
self._settings.sandbox_build_dir = (
@@ -363,7 +363,7 @@ def _daemon_wrapper(
daemon.logger = nix.logger.getChild("daemon")
daemon.settings["allowed-users"] = ["*"]
daemon.settings["trusted-users"] = []
daemon.settings.store = f"local?root={nix.env.dirs.test_root}"
daemon.settings.store = f"local?root={nix.env.dirs.test_root}&log={nix.env.dirs.nix_log_dir}&state={nix.env.dirs.nix_state_dir}"
daemon.settings.update(settings)
if requires_features := _daemon_protocol_xp_features.get(protocol):
daemon.settings.add_xp_feature(*requires_features)