From 93ca179023d87e71892a8d7c74ce4f100d33bb7e Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Fri, 17 Jul 2026 15:01:36 +0200 Subject: [PATCH] f2: fix nix fixture store setup log dir and state dir are not taken from the environment if root is set. Change-Id: I3752dcf7ac81b291e61beafbb3fed9601e3cfcd1 --- tests/functional2/testlib/fixtures/nix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional2/testlib/fixtures/nix.py b/tests/functional2/testlib/fixtures/nix.py index 3192838ec..5429aa228 100644 --- a/tests/functional2/testlib/fixtures/nix.py +++ b/tests/functional2/testlib/fixtures/nix.py @@ -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)