mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
nixos/tests/zfs: switch to runTest
This commit is contained in:
@@ -1849,7 +1849,7 @@ in
|
||||
zammad = runTest ./zammad.nix;
|
||||
zenohd = runTest ./zenohd.nix;
|
||||
zeronet-conservancy = runTest ./zeronet-conservancy.nix;
|
||||
zfs = handleTest ./zfs.nix { };
|
||||
zfs = import ./zfs.nix { inherit system pkgs runTest; };
|
||||
zigbee2mqtt = runTest ./zigbee2mqtt.nix;
|
||||
zipline = runTest ./zipline.nix;
|
||||
zoneminder = runTest ./zoneminder.nix;
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
{
|
||||
system ? builtins.currentSystem,
|
||||
config ? { },
|
||||
pkgs ? import ../.. { inherit system config; },
|
||||
system,
|
||||
pkgs,
|
||||
runTest,
|
||||
}:
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
|
||||
makeZfsTest =
|
||||
{
|
||||
@@ -15,11 +14,9 @@ let
|
||||
zfsPackage,
|
||||
extraTest ? "",
|
||||
}:
|
||||
makeTest {
|
||||
runTest {
|
||||
name = zfsPackage.kernelModuleAttribute;
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ elvishjerricco ];
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; [ elvishjerricco ];
|
||||
|
||||
nodes.machine =
|
||||
{
|
||||
@@ -250,7 +247,7 @@ in
|
||||
systemdStage1 = true;
|
||||
}).zfsroot;
|
||||
|
||||
expand-partitions = makeTest {
|
||||
expand-partitions = runTest {
|
||||
name = "multi-disk-zfs";
|
||||
nodes = {
|
||||
machine =
|
||||
|
||||
Reference in New Issue
Block a user