nix: use reverse-DNS style id as unique identifier

Signed-off-by: Ophestra <cat@gensokyo.uk>

3 files changed, 30 insertions, 24 deletions

diff --git a/test/configuration.nix b/test/configuration.nix
index 6b3090cb..0bee0b2e 100644
--- a/test/configuration.nix
+++ b/test/configuration.nix
@@ -99,9 +99,10 @@
       home.stateVersion = "23.05";
     };
 
-    apps = [
-      {
+    apps = {
+      "cat.gensokyo.extern.foot.noEnablements" = {
         name = "ne-foot";
+        identity = 1;
         verbose = true;
         share = pkgs.foot;
         packages = with pkgs; [
@@ -115,17 +116,21 @@
           dbus = false;
           pulse = false;
         };
-      }
-      {
+      };
+
+      "cat.gensokyo.extern.foot.pulseaudio" = {
         name = "pa-foot";
+        identity = 2;
         verbose = true;
         share = pkgs.foot;
         packages = [ pkgs.foot ];
         command = "foot";
         capability.dbus = false;
-      }
-      {
+      };
+
+      "cat.gensokyo.extern.Alacritty.x11" = {
         name = "x11-alacritty";
+        identity = 3;
         verbose = true;
         share = pkgs.alacritty;
         packages = with pkgs; [
@@ -142,9 +147,11 @@
           dbus = false;
           pulse = false;
         };
-      }
-      {
+      };
+
+      "cat.gensokyo.extern.foot.directWayland" = {
         name = "da-foot";
+        identity = 4;
         verbose = true;
         insecureWayland = true;
         share = pkgs.foot;
@@ -159,9 +166,11 @@
           dbus = false;
           pulse = false;
         };
-      }
-      {
+      };
+
+      "cat.gensokyo.extern.strace.wantFail" = {
         name = "strace-failure";
+        identity = 5;
         verbose = true;
         share = pkgs.strace;
         command = "strace true";
@@ -171,7 +180,7 @@
           dbus = false;
           pulse = false;
         };
-      }
-    ];
+      };
+    };
   };
 }
diff --git a/test/sandbox/case/default.nix b/test/sandbox/case/default.nix
index d860b1e5..21bdd4a0 100644
--- a/test/sandbox/case/default.nix
+++ b/test/sandbox/case/default.nix
@@ -24,7 +24,7 @@ let
   };
 
   callTestCase =
-    path:
+    path: identity:
     let
       tc = import path {
         inherit
@@ -36,6 +36,7 @@ let
     in
     {
       name = "check-sandbox-${tc.name}";
+      inherit identity;
       verbose = true;
       inherit (tc)
         tty
@@ -51,10 +52,12 @@ let
         (toString (builtins.toFile "fortify-${tc.name}-want.json" (builtins.toJSON tc.want)))
       ];
     };
+
+  testCaseName = name: "cat.gensokyo.fortify.test." + name;
 in
 {
-  preset = callTestCase ./preset.nix;
-  tty = callTestCase ./tty.nix;
-  mapuid = callTestCase ./mapuid.nix;
-  device = callTestCase ./device.nix;
+  ${testCaseName "preset"} = callTestCase ./preset.nix 1;
+  ${testCaseName "tty"} = callTestCase ./tty.nix 2;
+  ${testCaseName "mapuid"} = callTestCase ./mapuid.nix 3;
+  ${testCaseName "device"} = callTestCase ./device.nix 4;
 }
diff --git a/test/sandbox/configuration.nix b/test/sandbox/configuration.nix
index 903b99a3..473e9d3c 100644
--- a/test/sandbox/configuration.nix
+++ b/test/sandbox/configuration.nix
@@ -6,7 +6,6 @@
 }:
 let
   testProgram = pkgs.callPackage ./tool/package.nix { inherit (config.environment.fortify.package) version; };
-  testCases = import ./case lib testProgram;
 in
 {
   users.users = {
@@ -76,11 +75,6 @@ in
       }
     ];
 
-    apps = with testCases; [
-      preset
-      tty
-      mapuid
-      device
-    ];
+    apps = import ./case lib testProgram;
   };
 }