summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-12-01 15:39:11 +0100
committerlassulus <lassulus@lassul.us>2022-12-24 20:53:56 +0100
commit17da9b07089b9929b422077558dc4fbcebb86d36 (patch)
treefb11c727129466ebf5211f7eb1eb015cdec3d226 /tests
parent4ce2aa484599f967a2d4411f5c2e575898a53e7e (diff)
init disk-deactivate for cleaning up the disk
Diffstat (limited to 'tests')
-rw-r--r--tests/lib.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/lib.nix b/tests/lib.nix
index 4b81da7..80ad0e3 100644
--- a/tests/lib.nix
+++ b/tests/lib.nix
@@ -26,6 +26,7 @@
tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create (import disko-config { disks = builtins.tail disks; inherit lib; }));
tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount (import disko-config { disks = builtins.tail disks; inherit lib; }));
tsp-config = (pkgs.callPackage ../. { }).config (import disko-config { inherit disks; inherit lib; });
+ tsp-disko = pkgs.writeScript "disko" ((pkgs.callPackage ../. { }).zapCreateMount (import disko-config { disks = builtins.tail disks; inherit lib; }));
num-disks = builtins.length (lib.attrNames (import disko-config { inherit lib; }).disk);
installed-system = { modulesPath, ... }: {
imports = [
@@ -60,9 +61,6 @@
efiSupport = efi;
efiInstallAsRemovable = efi;
};
- environment.systemPackages = [
- pkgs.jq
- ];
};
installedTopLevel = (eval-config {
modules = [ installed-system ];
@@ -93,6 +91,9 @@
(modulesPath + "/profiles/minimal.nix")
extraConfig
];
+ environment.systemPackages = [
+ pkgs.jq
+ ];
# speed-up eval
documentation.enable = false;
@@ -127,20 +128,24 @@
machine.succeed("${tsp-create}")
machine.succeed("${tsp-mount}")
machine.succeed("${tsp-mount}") # verify that the command is idempotent
+ machine.succeed("${tsp-disko}") # verify that we can destroy and recreate
''}
${lib.optionalString (testMode == "module") ''
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
+ machine.succeed("${nodes.machine.system.build.disko}") # verify that we can destroy and recreate again
''}
${lib.optionalString (testMode == "cli") ''
# TODO use the disko cli here
# machine.succeed("${../.}/disko --no-pkgs --mode create ${disko-config}")
# machine.succeed("${../.}/disko --no-pkgs --mode mount ${disko-config}")
# machine.succeed("${../.}/disko --no-pkgs --mode mount ${disko-config}") # verify that the command is idempotent
+ # machine.succeed("${../.}/disko --no-pkgs --mode zap_create_mount ${disko-config}") # verify that we can destroy and recreate again
machine.succeed("${tsp-create}")
machine.succeed("${tsp-mount}")
machine.succeed("${tsp-mount}") # verify that the command is idempotent
+ machine.succeed("${tsp-disko}") # verify that we can destroy and recreate
''}
${lib.optionalString testBoot ''