From 0e9ec77cc633907aa93bf3d758013f6f699f8842 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 20 Sep 2023 18:36:07 +0200
Subject: [PATCH] Fix test function to work with Nixpkgs 23.05

---
 nixproc/test-driver/agnostic.nix                    | 13 ++++++++-----
 tests/services/docker/default.nix                   |  1 +
 .../nginx-reverse-proxy-hostbased/default.nix       |  1 +
 tests/services/s6-svscan/default.nix                |  1 +
 tests/services/supervisord/default.nix              |  1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixproc/test-driver/agnostic.nix b/nixproc/test-driver/agnostic.nix
index 7fc57be..c1b4c97 100644
--- a/nixproc/test-driver/agnostic.nix
+++ b/nixproc/test-driver/agnostic.nix
@@ -11,7 +11,7 @@ let
     inherit pkgs system;
   };
 
-  testSystemVariantForProcessManager = {processManager, profileSettings, exprFile, extraParams ? {}, nixosConfig ? null, systemPackages ? [], initialTests ? null, readiness ? null, tests ? null, postTests ? null}:
+  testSystemVariantForProcessManager = {name, processManager, profileSettings, exprFile, extraParams ? {}, nixosConfig ? null, systemPackages ? [], initialTests ? null, readiness ? null, tests ? null, postTests ? null}:
     let
       processManagerModule = builtins.getAttr processManager processManagerModules;
 
@@ -31,7 +31,9 @@ let
     with import "${nixpkgs}/nixos/lib/testing-python.nix" { inherit system; };
 
     makeTest {
-      machine =
+      inherit name;
+
+      nodes.machine =
         {pkgs, lib, ...}:
 
         {
@@ -77,13 +79,14 @@ let
               let
                 instance = builtins.getAttr instanceName processes;
               in
-              tests ({ inherit instanceName instance; } // processManagerSettings.params)
+              tests ({ inherit instanceName instance processManager; } // processManagerSettings.params)
             ) (builtins.attrNames processes))
 
         + pkgs.lib.optionalString (postTests != null) (postTests (processManagerSettings.params // { inherit processes; }));
     };
 in
-{ processManagers
+{ name
+, processManagers
 , profiles
 , exprFile
 , extraParams ? {}
@@ -102,7 +105,7 @@ pkgs.lib.genAttrs profiles (profile:
   in
   pkgs.lib.genAttrs processManagers (processManager:
     testSystemVariantForProcessManager {
-      inherit processManager profileSettings exprFile extraParams nixosConfig systemPackages initialTests readiness tests postTests;
+      inherit name processManager profileSettings exprFile extraParams nixosConfig systemPackages initialTests readiness tests postTests;
     }
   )
 )
diff --git a/tests/services/docker/default.nix b/tests/services/docker/default.nix
index f0446d5..55ae1a9 100644
--- a/tests/services/docker/default.nix
+++ b/tests/services/docker/default.nix
@@ -1,6 +1,7 @@
 { pkgs, testService, processManagers, profiles }:
 
 testService {
+  name = "docker";
   exprFile = ./processes.nix;
   systemPackages = [ pkgs.docker ];
 
diff --git a/tests/services/nginx-reverse-proxy-hostbased/default.nix b/tests/services/nginx-reverse-proxy-hostbased/default.nix
index 6045c3f..f1ceae9 100644
--- a/tests/services/nginx-reverse-proxy-hostbased/default.nix
+++ b/tests/services/nginx-reverse-proxy-hostbased/default.nix
@@ -1,6 +1,7 @@
 { pkgs, testService, processManagers, profiles }:
 
 testService {
+  name = "nginx-reverse-proxy-hostbased";
   exprFile = ./processes.nix;
 
   readiness = {instanceName, instance, ...}:
diff --git a/tests/services/s6-svscan/default.nix b/tests/services/s6-svscan/default.nix
index d198cdb..664cb41 100644
--- a/tests/services/s6-svscan/default.nix
+++ b/tests/services/s6-svscan/default.nix
@@ -41,6 +41,7 @@ let
     };
 in
 testService {
+  name = "s6-svscan";
   exprFile = ./processes.nix;
   systemPackages = [ pkgs.s6-rc ];
 
diff --git a/tests/services/supervisord/default.nix b/tests/services/supervisord/default.nix
index 71ddbea..abeca41 100644
--- a/tests/services/supervisord/default.nix
+++ b/tests/services/supervisord/default.nix
@@ -26,6 +26,7 @@ let
     };
 in
 testService {
+  name = "supervisord";
   exprFile = ./processes.nix;
   systemPackages = [ pkgs.python3Packages.supervisor ];