From 5a266ecdde0fecc1425aed114be535a7fd19e243 Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Thu, 10 Apr 2025 14:33:54 +0200
Subject: [PATCH] clan-cli: Fixup more failing tests because of quoting issues

---
 pkgs/clan-cli/clan_cli/tests/test_machines_cli.py |  6 +++---
 pkgs/clan-cli/clan_cli/tests/test_vars.py         | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py b/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py
index db104635d..db708bce9 100644
--- a/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py
+++ b/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py
@@ -100,9 +100,9 @@ def test_machine_delete(
     my_generator["files"]["my_value"]["secret"] = False
     my_generator["files"]["my_secret"]["secret"] = True
     my_generator["script"] = (
-        "echo -n public > $out/my_value;"
-        "echo -n secret > $out/my_secret;"
-        "echo -n non-default > $out/value_with_default"
+        'echo -n public > "$out"/my_value;'
+        'echo -n secret > "$out"/my_secret;'
+        'echo -n non-default > "$out"/value_with_default'
     )
     flake.refresh()  # saves "my_generator"
     monkeypatch.chdir(flake.path)
diff --git a/pkgs/clan-cli/clan_cli/tests/test_vars.py b/pkgs/clan-cli/clan_cli/tests/test_vars.py
index b007c14f4..680b15d7f 100644
--- a/pkgs/clan-cli/clan_cli/tests/test_vars.py
+++ b/pkgs/clan-cli/clan_cli/tests/test_vars.py
@@ -838,12 +838,12 @@ def test_fails_when_files_are_left_from_other_backend(
         "my_secret_generator"
     ]
     my_secret_generator["files"]["my_secret"]["secret"] = True
-    my_secret_generator["script"] = "echo hello > $out/my_secret"
+    my_secret_generator["script"] = 'echo hello > "$out"/my_secret'
     my_value_generator = config["clan"]["core"]["vars"]["generators"][
         "my_value_generator"
     ]
     my_value_generator["files"]["my_value"]["secret"] = False
-    my_value_generator["script"] = "echo hello > $out/my_value"
+    my_value_generator["script"] = 'echo hello > "$out"/my_value'
     flake.refresh()
     monkeypatch.chdir(flake.path)
     for generator in ["my_secret_generator", "my_value_generator"]:
@@ -903,7 +903,7 @@ def test_invalidation(
     config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
     my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
     my_generator["files"]["my_value"]["secret"] = False
-    my_generator["script"] = "echo -n $RANDOM > $out/my_value"
+    my_generator["script"] = 'echo -n "$RANDOM" > "$out"/my_value'
     flake.refresh()
     monkeypatch.chdir(flake.path)
     cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"])
@@ -948,14 +948,14 @@ def test_dynamic_invalidation(
 
     my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
     my_generator["files"]["my_value"]["secret"] = False
-    my_generator["script"] = "echo -n $RANDOM > $out/my_value"
+    my_generator["script"] = 'echo -n "$RANDOM" > "$out"/my_value'
 
     dependent_generator = config["clan"]["core"]["vars"]["generators"][
         "dependent_generator"
     ]
     dependent_generator["files"]["my_value"]["secret"] = False
     dependent_generator["dependencies"] = ["my_generator"]
-    dependent_generator["script"] = "echo -n $RANDOM > $out/my_value"
+    dependent_generator["script"] = 'echo -n "$RANDOM" > "$out"/my_value'
 
     flake.refresh()