From 9f7f23abdb161578316d94f45528fbf47982f4d9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 30 Sep 2022 12:55:28 +0200 Subject: add nixos tests for disko.config, extend/fix existing tests --- tests/complex.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'tests/complex.nix') diff --git a/tests/complex.nix b/tests/complex.nix index 3fa861e..cd87b3b 100644 --- a/tests/complex.nix +++ b/tests/complex.nix @@ -3,16 +3,23 @@ }: makeDiskoTest { disko-config = import ../example/complex.nix; + extraConfig = { + fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! + }; extraTestScript = '' machine.succeed("test -b /dev/zroot/zfs_testvolume"); machine.succeed("test -b /dev/md/raid1p1"); - machine.succeed("mountpoint /mnt"); - machine.succeed("mountpoint /mnt/zfs_fs"); - machine.succeed("mountpoint /mnt/zfs_legacy_fs"); - machine.succeed("mountpoint /mnt/ext4onzfs"); - machine.succeed("mountpoint /mnt/ext4_on_lvm"); + machine.succeed("mountpoint /zfs_fs"); + machine.succeed("mountpoint /zfs_legacy_fs"); + machine.succeed("mountpoint /ext4onzfs"); + machine.succeed("mountpoint /ext4_on_lvm"); + ''; + enableOCR = true; + bootCommands = '' + machine.wait_for_text("Passphrase for") + machine.send_chars("secret\n") ''; extraConfig = { boot.kernelModules = [ "dm-raid" "dm-mirror" ]; -- cgit v1.2.3