From 7b46303479326b49c2b616b2c6b02e93949feb16 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 31 Mar 2021 22:41:48 +0200
Subject: [PATCH] Allow tests to use extraParams

---
 nixproc/backends/disnix/test-module/default.nix      | 4 ++--
 nixproc/backends/docker/test-module/default.nix      | 4 ++--
 nixproc/backends/s6-rc/test-module/default.nix       | 4 ++--
 nixproc/backends/supervisord/test-module/default.nix | 4 ++--
 nixproc/backends/systemd/test-module/default.nix     | 4 ++--
 nixproc/backends/sysvinit/test-module/default.nix    | 4 ++--
 nixproc/test-driver/agnostic.nix                     | 9 +++++----
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/nixproc/backends/disnix/test-module/default.nix b/nixproc/backends/disnix/test-module/default.nix
index 09450fa..fe14c2a 100644
--- a/nixproc/backends/disnix/test-module/default.nix
+++ b/nixproc/backends/disnix/test-module/default.nix
@@ -1,4 +1,4 @@
-{profileSettings, exprFile, tools, pkgs, system}:
+{profileSettings, exprFile, extraParams, tools, pkgs, system}:
 
 let
   executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
@@ -6,7 +6,7 @@ let
   };
 
   processesEnvSystem = import ../build-disnix-env.nix ({
-    inherit pkgs system exprFile;
+    inherit pkgs system exprFile extraParams;
     disnixDataDir = "${pkgs.disnix}/share/disnix";
   } // profileSettings.params);
 in
diff --git a/nixproc/backends/docker/test-module/default.nix b/nixproc/backends/docker/test-module/default.nix
index dccda6f..7bfffef 100644
--- a/nixproc/backends/docker/test-module/default.nix
+++ b/nixproc/backends/docker/test-module/default.nix
@@ -1,4 +1,4 @@
-{profileSettings, exprFile, tools, pkgs, system}:
+{profileSettings, exprFile, extraParams, tools, pkgs, system}:
 
 let
   executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
@@ -11,7 +11,7 @@ let
   } // profileSettings.params);
 
   processesEnvSystem = import ../build-docker-env.nix ({
-    inherit pkgs system exprFile;
+    inherit pkgs system exprFile extraParams;
   } // profileSettings.params);
 in
 {
diff --git a/nixproc/backends/s6-rc/test-module/default.nix b/nixproc/backends/s6-rc/test-module/default.nix
index 399a0be..e612629 100644
--- a/nixproc/backends/s6-rc/test-module/default.nix
+++ b/nixproc/backends/s6-rc/test-module/default.nix
@@ -1,4 +1,4 @@
-{profileSettings, exprFile, tools, pkgs, system}:
+{profileSettings, exprFile, extraParams, tools, pkgs, system}:
 
 let
   executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
@@ -11,7 +11,7 @@ let
   } // profileSettings.params);
 
   processesEnvSystem = import ../build-s6-rc-env.nix ({
-    inherit pkgs system exprFile;
+    inherit pkgs system exprFile extraParams;
   } // profileSettings.params);
 in
 {
diff --git a/nixproc/backends/supervisord/test-module/default.nix b/nixproc/backends/supervisord/test-module/default.nix
index fd421f2..00a8565 100644
--- a/nixproc/backends/supervisord/test-module/default.nix
+++ b/nixproc/backends/supervisord/test-module/default.nix
@@ -1,4 +1,4 @@
-{profileSettings, exprFile, tools, pkgs, system}:
+{profileSettings, exprFile, extraParams, tools, pkgs, system}:
 
 let
   executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
@@ -11,7 +11,7 @@ let
   } // profileSettings.params);
 
   processesEnvSystem = import ../build-supervisord-env.nix ({
-    inherit pkgs system exprFile;
+    inherit pkgs system exprFile extraParams;
   } // profileSettings.params);
 in
 {
diff --git a/nixproc/backends/systemd/test-module/default.nix b/nixproc/backends/systemd/test-module/default.nix
index 33dddd1..3e42634 100644
--- a/nixproc/backends/systemd/test-module/default.nix
+++ b/nixproc/backends/systemd/test-module/default.nix
@@ -1,4 +1,4 @@
-{profileSettings, exprFile, tools, pkgs, system}:
+{profileSettings, exprFile, extraParams, tools, pkgs, system}:
 
 let
   executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
@@ -6,7 +6,7 @@ let
   };
 
   processesEnvSystem = import ../build-systemd-env.nix ({
-    inherit pkgs system exprFile;
+    inherit pkgs system exprFile extraParams;
   } // profileSettings.params);
 
   deployEnv = if profileSettings.params.forceDisableUserChange
diff --git a/nixproc/backends/sysvinit/test-module/default.nix b/nixproc/backends/sysvinit/test-module/default.nix
index 3e9a125..4b0e681 100644
--- a/nixproc/backends/sysvinit/test-module/default.nix
+++ b/nixproc/backends/sysvinit/test-module/default.nix
@@ -1,4 +1,4 @@
-{profileSettings, exprFile, tools, pkgs, system}:
+{profileSettings, exprFile, extraParams, tools, pkgs, system}:
 
 let
   executeDeploy = import ../../../test-driver/util/execute-deploy.nix {
@@ -6,7 +6,7 @@ let
   };
 
   processesEnvSystem = import ../build-sysvinit-env.nix ({
-    inherit pkgs system exprFile;
+    inherit pkgs system exprFile extraParams;
   } // profileSettings.params);
 in
 {
diff --git a/nixproc/test-driver/agnostic.nix b/nixproc/test-driver/agnostic.nix
index be435a2..72aa329 100644
--- a/nixproc/test-driver/agnostic.nix
+++ b/nixproc/test-driver/agnostic.nix
@@ -11,17 +11,17 @@ let
     inherit pkgs system;
   };
 
-  testSystemVariantForProcessManager = {processManager, profileSettings, exprFile, nixosConfig ? null, systemPackages ? [], initialTests ? null, readiness, tests}:
+  testSystemVariantForProcessManager = {processManager, profileSettings, exprFile, extraParams ? {}, nixosConfig ? null, systemPackages ? [], initialTests ? null, readiness, tests}:
     let
       processManagerModule = builtins.getAttr processManager processManagerModules;
 
       processManagerSettings = import processManagerModule {
-        inherit profileSettings exprFile pkgs system tools;
+        inherit profileSettings exprFile extraParams pkgs system tools;
       };
 
       processes = import exprFile ({
         inherit pkgs system processManager;
-      } // profileSettings.params);
+      } // extraParams // profileSettings.params);
     in
     with import "${nixpkgs}/nixos/lib/testing-python.nix" { inherit system; };
 
@@ -77,6 +77,7 @@ in
 { processManagers
 , profiles
 , exprFile
+, extraParams ? {}
 , nixosConfig ? null
 , systemPackages ? []
 , initialTests ? null
@@ -91,7 +92,7 @@ pkgs.lib.genAttrs profiles (profile:
   in
   pkgs.lib.genAttrs processManagers (processManager:
     testSystemVariantForProcessManager {
-      inherit processManager profileSettings exprFile nixosConfig systemPackages initialTests readiness tests;
+      inherit processManager profileSettings exprFile extraParams nixosConfig systemPackages initialTests readiness tests;
     }
   )
 )