From 67f991e2bcf38d7c2a99f1cdbbdb4fbc60b8e8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 29 Nov 2022 14:58:31 +0100 Subject: drop environment.systemPackages Those packages are only used for installation and are not used afterwards. system.build outputs can be used to get them in an installer included. --- tests/lib.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests') diff --git a/tests/lib.nix b/tests/lib.nix index 195abcc..3fb3486 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; }; }; -- cgit v1.2.3 From 0f21bc31fe237ed1c9f8fdd3a0e8be633588302a Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 1 Dec 2022 20:11:22 +0100 Subject: tests module: test system.build output instead of systemPackages --- tests/lib.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/lib.nix b/tests/lib.nix index 3fb3486..6d787ed 100644 --- a/tests/lib.nix +++ b/tests/lib.nix @@ -103,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): @@ -126,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 -- cgit v1.2.3