From 489977bf3b82b1994c53d52f99ebd3a239f130eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Sep 2024 18:40:18 +0200 Subject: [PATCH] no longer write deprecated settings.json in tests --- pkgs/clan-cli/tests/fixtures_flakes.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/clan-cli/tests/fixtures_flakes.py b/pkgs/clan-cli/tests/fixtures_flakes.py index 28bd27260..983a1e321 100644 --- a/pkgs/clan-cli/tests/fixtures_flakes.py +++ b/pkgs/clan-cli/tests/fixtures_flakes.py @@ -55,9 +55,8 @@ def set_machine_settings( machine_name: str, machine_settings: dict, ) -> None: - settings_path = flake / "machines" / machine_name / "settings.json" - settings_path.parent.mkdir(parents=True, exist_ok=True) - settings_path.write_text(json.dumps(machine_settings, indent=2)) + config_path = flake / "machines" / machine_name / "configuration.json" + config_path.write_text(json.dumps(machine_settings, indent=2)) def generate_flake( @@ -121,7 +120,12 @@ def generate_flake( # generate machines from machineConfigs for machine_name, machine_config in machine_configs.items(): - set_machine_settings(flake, machine_name, machine_config) + configuration_nix = flake / "machines" / machine_name / "configuration.nix" + configuration_nix.parent.mkdir(parents=True, exist_ok=True) + configuration_nix.write_text(""" + { imports = [ (builtins.fromJSON (builtins.readFile ./configuration.json)) ]; } + """) + set_machine_config(flake, machine_name, machine_config) if "/tmp" not in str(os.environ.get("HOME")): log.warning(