diff options
| author | Julian Stecklina <julian.stecklina@cyberus-technology.de> | 2019-10-27 13:53:36 +0100 |
|---|---|---|
| committer | Jacek Galowicz <jacek.galowicz@cyberus-technology.de> | 2019-11-04 23:51:10 +0100 |
| commit | 40396a7e12419fc772063d2a3fa87ec7d14a46d9 (patch) | |
| tree | 353146e8b23c1ddbbdde0e73007cd30359cd517d /nixos/tests/zfs.nix | |
| parent | 48508da01e754f3ed3a7d2656bbc695ab66036bc (diff) | |
| download | nixpkgs-40396a7e12419fc772063d2a3fa87ec7d14a46d9.tar nixpkgs-40396a7e12419fc772063d2a3fa87ec7d14a46d9.tar.gz nixpkgs-40396a7e12419fc772063d2a3fa87ec7d14a46d9.tar.bz2 nixpkgs-40396a7e12419fc772063d2a3fa87ec7d14a46d9.tar.lz nixpkgs-40396a7e12419fc772063d2a3fa87ec7d14a46d9.tar.xz nixpkgs-40396a7e12419fc772063d2a3fa87ec7d14a46d9.tar.zst nixpkgs-40396a7e12419fc772063d2a3fa87ec7d14a46d9.zip | |
nixos/zfs: convert test to python
Diffstat (limited to 'nixos/tests/zfs.nix')
| -rw-r--r-- | nixos/tests/zfs.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index d7a08268e98..8f844aca416 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -7,7 +7,7 @@ with import ../lib/testing.nix { inherit system pkgs; }; let - makeTest = import ./make-test.nix; + makeTest = import ./make-test-python.nix; makeZfsTest = name: { kernelPackage ? pkgs.linuxPackages_latest @@ -34,12 +34,12 @@ let }; testScript = '' - $machine->succeed("modprobe zfs"); - $machine->succeed("zpool status"); + machine.succeed("modprobe zfs") + machine.succeed("zpool status") - $machine->succeed("ls /dev"); + machine.succeed("ls /dev") - $machine->succeed( + machine.succeed( "mkdir /tmp/mnt", "udevadm settle", @@ -55,9 +55,7 @@ let "umount /tmp/mnt", "zpool destroy rpool", "udevadm settle" - - ); - + ) '' + extraTest; }; @@ -70,8 +68,8 @@ in { unstable = makeZfsTest "unstable" { enableUnstable = true; extraTest = '' - $machine->succeed( - "echo password | zpool create -o altroot='/tmp/mnt' -O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1", + machine.succeed( + "echo password | zpool create -o altroot=\"/tmp/mnt\" -O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1", "zfs create -o mountpoint=legacy rpool/root", "mount -t zfs rpool/root /tmp/mnt", "udevadm settle", @@ -79,7 +77,7 @@ in { "umount /tmp/mnt", "zpool destroy rpool", "udevadm settle" - ); + ) ''; }; |