about summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorAndrew Marshall <andrew@johnandrewmarshall.com>2024-01-27 12:17:29 -0500
committerAndrew Marshall <andrew@johnandrewmarshall.com>2024-02-27 18:45:47 -0500
commit1c846675398059067b6ad147abc6a7877c4b8368 (patch)
tree243834c442bd4ce09ff0e5bc2f4b66cd6826917a /nixos/tests
parentdcff4f831836e249db5e808aeac6ca71d498cdc7 (diff)
downloadnixlib-1c846675398059067b6ad147abc6a7877c4b8368.tar
nixlib-1c846675398059067b6ad147abc6a7877c4b8368.tar.gz
nixlib-1c846675398059067b6ad147abc6a7877c4b8368.tar.bz2
nixlib-1c846675398059067b6ad147abc6a7877c4b8368.tar.lz
nixlib-1c846675398059067b6ad147abc6a7877c4b8368.tar.xz
nixlib-1c846675398059067b6ad147abc6a7877c4b8368.tar.zst
nixlib-1c846675398059067b6ad147abc6a7877c4b8368.zip
nixos/tests/zfs: Get test name from pkg under test
The previous names are already this.
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/zfs.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index a9bf66607574..4bc608ac75e5 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -7,14 +7,14 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
 
 let
 
-  makeZfsTest = name:
+  makeZfsTest =
     { kernelPackages
     , enableSystemdStage1 ? false
     , zfsPackage
     , extraTest ? ""
     }:
     makeTest {
-      name = "zfs-" + name;
+      name = zfsPackage.kernelModuleAttribute;
       meta = with pkgs.lib.maintainers; {
         maintainers = [ elvishjerricco ];
       };
@@ -192,22 +192,22 @@ let
 in {
 
   # maintainer: @raitobezarius
-  series_2_1 = makeZfsTest "zfs_2_1" {
+  series_2_1 = makeZfsTest {
     zfsPackage = pkgs.zfs_2_1;
     kernelPackages = pkgs.linuxPackages;
   };
 
-  series_2_2 = makeZfsTest "zfs_2_2" {
+  series_2_2 = makeZfsTest {
     zfsPackage = pkgs.zfs_2_2;
     kernelPackages = pkgs.linuxPackages;
   };
 
-  unstable = makeZfsTest "zfsUnstable" rec {
+  unstable = makeZfsTest rec {
     zfsPackage = pkgs.zfsUnstable;
     kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
   };
 
-  unstableWithSystemdStage1 = makeZfsTest "zfsUnstable" rec {
+  unstableWithSystemdStage1 = makeZfsTest rec {
     zfsPackage = pkgs.zfsUnstable;
     kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
     enableSystemdStage1 = true;