From f25d94d9c06e595f9369bcb3a8aa31e9b757ca92 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 29 Sep 2025 21:36:24 -0400
Subject: [PATCH] nixos/tests/incus: give tests unique names

---
 nixos/tests/incus/default.nix            | 31 +++++++++++++++++-------
 nixos/tests/incus/incus-tests-module.nix |  5 ++++
 nixos/tests/incus/incus-tests.nix        |  5 +++-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix
index fb10fa56e0dd..db8bf44ccf4a 100644
--- a/nixos/tests/incus/default.nix
+++ b/nixos/tests/incus/default.nix
@@ -19,6 +19,8 @@ let
 in
 {
   all = incusRunTest {
+    name = "all";
+    appArmor = true;
     feature.user = true;
 
     instances = {
@@ -41,20 +43,25 @@ in
     };
   };
 
-  # appArmor = incusRunTest {
-  #   all = true;
-  #   appArmor = true;
-  # };
-
   container = incusRunTest {
+    name = "container";
+
     instances.c1 = {
       type = "container";
     };
   };
 
-  lvm = incusRunTest { storage.lvm = true; };
+  lvm = incusRunTest {
+    name = "lvm";
 
-  openvswitch = incusRunTest { network.ovs = true; };
+    storage.lvm = true;
+  };
+
+  openvswitch = incusRunTest {
+    name = "openvswitch";
+
+    network.ovs = true;
+  };
 
   ui = runTest {
     imports = [ ./ui.nix ];
@@ -63,12 +70,14 @@ in
   };
 
   virtual-machine = incusRunTest {
+    name = "virtual-machine";
+
     instances = {
       vm1 = {
         type = "virtual-machine";
       };
 
-      # TODO never becomes available
+      # disabled because never becomes available
       # csm = {
       #   type = "virtual-machine";
       #   incusConfig.config = {
@@ -78,5 +87,9 @@ in
     };
   };
 
-  zfs = incusRunTest { storage.zfs = true; };
+  zfs = incusRunTest {
+    name = "zfs";
+
+    storage.zfs = true;
+  };
 }
diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix
index 4f8df4d08c2a..085dbfbc8750 100644
--- a/nixos/tests/incus/incus-tests-module.nix
+++ b/nixos/tests/incus/incus-tests-module.nix
@@ -8,6 +8,11 @@ let
 in
 {
   options.tests.incus = {
+    name = lib.mkOption {
+      type = lib.types.str;
+      description = "name appended to test";
+    };
+
     package = lib.mkPackageOption pkgs "incus" { };
 
     preseed = lib.mkOption {
diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix
index 56ed1f087803..ec5a6061b0d2 100644
--- a/nixos/tests/incus/incus-tests.nix
+++ b/nixos/tests/incus/incus-tests.nix
@@ -15,12 +15,15 @@ let
   ) "" cfg.instances;
 in
 {
-  name = cfg.package.name;
+  name = "${cfg.package.name}-${cfg.name}";
 
   meta = {
     maintainers = lib.teams.lxc.members;
   };
 
+  # sshBackdoor.enable = true;
+  # enableDebugHook = true;
+
   nodes.server = {
     virtualisation = {
       cores = 2;