Merge #153

153: tests: add test names r=Mic92 a=lilyinstarlight



Co-authored-by: Lily Foster <lily@lily.flowers>

tests/bcachefs.nix

@@ -5,6 +5,7 @@ let
   linux-bcachefs = pkgs.callPackage ../linux-testing-bcachefs.nix { };
 in
 makeDiskoTest {
+  name = "bcachefs";
   disko-config = ../example/bcachefs.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /");

tests/boot-raid1.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "boot-raid1";
   disko-config = ../example/boot-raid1.nix;
   extraTestScript = ''
     machine.succeed("test -b /dev/md/boot");

tests/btrfs-subvolumes.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "btrfs-subvolumes";
   disko-config = ../example/btrfs-subvolumes.nix;
   extraTestScript = ''
     machine.succeed("test -e /test");

tests/cli.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "cli";
   disko-config = ../example/complex.nix;
   extraConfig = {
     fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!

tests/complex.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "complex";
   disko-config = ../example/complex.nix;
   extraConfig = {
     fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!

tests/gpt-bios-compat.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "gpt-bios-compat";
   disko-config = ../example/gpt-bios-compat.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /");

tests/hybrid-tmpfs-on-root.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "hybrid-tmpfs-on-root";
   disko-config = ../example/hybrid-tmpfs-on-root.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /");

tests/hybrid.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "hybrid";
   disko-config = ../example/hybrid.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /");

tests/lib.nix

@@ -5,7 +5,8 @@
 }:
 {
   makeDiskoTest =
-    { disko-config
+    { name
+    , disko-config
     , extraTestScript ? ""
     , bootCommands ? ""
     , extraConfig ? { }
@@ -70,7 +71,7 @@
       }).config.system.build.toplevel;
     in
     makeTest' {
-      name = "disko";
+      name = "disko-${name}";
 
       inherit enableOCR;
       nodes.machine = { config, pkgs, modulesPath, ... }: {

tests/luks-lvm.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "luks-lvm";
   disko-config = ../example/luks-lvm.nix;
   extraTestScript = ''
     machine.succeed("cryptsetup isLuks /dev/vda2");

tests/lvm-raid.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "lvm-raid";
   disko-config = ../example/lvm-raid.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /home");

tests/mdadm.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "mdadm";
   disko-config = ../example/mdadm.nix;
   extraTestScript = ''
     machine.succeed("test -b /dev/md/raid1");

tests/module.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "module";
   disko-config = ../example/complex.nix;
   extraConfig = {
     fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!

tests/multi-device-no-deps.nix

@@ -3,6 +3,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "multi-device-no-deps";
   disko-config = ../example/multi-device-no-deps.nix;
   testBoot = false;
   extraTestScript = ''

tests/negative-size.nix

@@ -3,6 +3,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "negative-size";
   disko-config = ../example/negative-size.nix;
   testBoot = false;
   extraTestScript = ''

tests/simple-efi.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "simple-efi";
   disko-config = ../example/simple-efi.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /");

tests/swap.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "swap";
   disko-config = ../example/swap.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /");

tests/tmpfs.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "tmpfs";
   disko-config = ../example/tmpfs.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /");

tests/with-lib.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "with-lib";
   disko-config = ../example/with-lib.nix;
   extraTestScript = ''
     machine.succeed("mountpoint /");

tests/zfs-over-legacy.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "zfs-over-legacy";
   disko-config = ../example/zfs-over-legacy.nix;
   extraTestScript = ''
     machine.succeed("test -e /zfs_fs");

tests/zfs.nix

@@ -2,6 +2,7 @@
 , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
+  name = "zfs";
   disko-config = ../example/zfs.nix;
   extraConfig = {
     fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!