summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2022-12-01 22:37:53 +0100
committerGitHub <noreply@github.com>2022-12-01 22:37:53 +0100
commitaca927667acea7bb01dc8e72ee71f6548d9fd41b (patch)
tree2d372d2a79b3663e8653e0fc16fd436c75a12758 /tests
parent4c1b8a4e596fa5b9e23ad78170c95512ab71bd74 (diff)
parent25cc022282590f36ed2c3cb542774053d58dddc8 (diff)
Merge pull request #65 from nix-community/no-deps
Diffstat (limited to 'tests')
-rw-r--r--tests/lib.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/lib.nix b/tests/lib.nix
index 195abcc..6d787ed 100644
--- a/tests/lib.nix
+++ b/tests/lib.nix
@@ -33,7 +33,6 @@
(lib.optionalAttrs (testMode == "module") {
imports = [ ../module.nix ];
disko = {
- addScripts = false;
enableConfig = true;
devices = import disko-config { inherit disks lib; };
};
@@ -76,7 +75,6 @@
(lib.optionalAttrs (testMode == "module") {
imports = [ ../module.nix ];
disko = {
- addScripts = true;
enableConfig = false;
devices = import disko-config { disks = builtins.tail disks; inherit lib; };
};
@@ -105,7 +103,7 @@
virtualisation.emptyDiskImages = builtins.genList (_: 4096) num-disks;
};
- testScript = ''
+ testScript = { nodes, ... }: ''
def disks(oldmachine, num_disks):
disk_flags = ""
for i in range(num_disks):
@@ -128,9 +126,9 @@
machine.succeed("${tsp-mount}") # verify that the command is idempotent
''}
${lib.optionalString (testMode == "module") ''
- machine.succeed("disko-create")
- machine.succeed("disko-mount")
- machine.succeed("disko-mount") # verify that the command is idempotent
+ machine.succeed("${nodes.machine.system.build.formatScript}")
+ machine.succeed("${nodes.machine.system.build.mountScript}")
+ machine.succeed("${nodes.machine.system.build.mountScript}") # verify that the command is idempotent
''}
${lib.optionalString (testMode == "cli") ''
# TODO use the disko cli here