From 76d301bc94580da29fa4ceec2856b2d3ef755162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 2 Sep 2023 18:20:39 +0200 Subject: [PATCH] tests/complex: also mark zfs_fs dataset as non-fail Reason is probably same as zfs_legacy_fs --- tests/cli.nix | 2 +- tests/complex.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/cli.nix b/tests/cli.nix index 24135cd..3ea88b9 100644 --- a/tests/cli.nix +++ b/tests/cli.nix @@ -7,13 +7,13 @@ diskoLib.testLib.makeDiskoTest { disko-config = ../example/complex.nix; extraSystemConfig = { fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! + fileSystems."/zfs_fs".options = [ "nofail" ]; # TODO find out why we need this! }; testMode = "direct"; extraTestScript = '' machine.succeed("test -b /dev/zroot/zfs_testvolume"); machine.succeed("test -b /dev/md/raid1p1"); - machine.succeed("mountpoint /zfs_fs"); machine.succeed("mountpoint /zfs_legacy_fs"); machine.succeed("mountpoint /ext4onzfs"); diff --git a/tests/complex.nix b/tests/complex.nix index 573503f..e9f40ba 100644 --- a/tests/complex.nix +++ b/tests/complex.nix @@ -7,6 +7,7 @@ diskoLib.testLib.makeDiskoTest { disko-config = ../example/complex.nix; extraSystemConfig = { fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! + fileSystems."/zfs_fs".options = [ "nofail" ]; # TODO find out why we need this! }; extraTestScript = '' machine.succeed("test -b /dev/zroot/zfs_testvolume");