Mirrors/disko
2
0
Fork 0
mirror of https://github.com/nix-community/disko synced 2024-11-10 06:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

tests/complex: also mark zfs_fs dataset as non-fail

Browse source 
Reason is probably same as zfs_legacy_fs
This commit is contained in:
Jörg Thalheim 2023-09-02 18:20:39 +02:00
parent c4f2de908d
commit 76d301bc94
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/cli.nix
View file

@ -7,13 +7,13 @@ diskoLib.testLib.makeDiskoTest {
disko-config = ../example/complex.nix; disko-config = ../example/complex.nix;
extraSystemConfig = { extraSystemConfig = {
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! 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"; testMode = "direct";
extraTestScript = '' extraTestScript = ''
machine.succeed("test -b /dev/zroot/zfs_testvolume"); machine.succeed("test -b /dev/zroot/zfs_testvolume");
machine.succeed("test -b /dev/md/raid1p1"); machine.succeed("test -b /dev/md/raid1p1");
machine.succeed("mountpoint /zfs_fs"); machine.succeed("mountpoint /zfs_fs");
machine.succeed("mountpoint /zfs_legacy_fs"); machine.succeed("mountpoint /zfs_legacy_fs");
machine.succeed("mountpoint /ext4onzfs"); machine.succeed("mountpoint /ext4onzfs");

1
tests/complex.nix
View file

@ -7,6 +7,7 @@ diskoLib.testLib.makeDiskoTest {
disko-config = ../example/complex.nix; disko-config = ../example/complex.nix;
extraSystemConfig = { extraSystemConfig = {
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! 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 = '' extraTestScript = ''
machine.succeed("test -b /dev/zroot/zfs_testvolume"); machine.succeed("test -b /dev/zroot/zfs_testvolume");