From d45f205a900f01e54e6e5b2175d79ed28dfa90f3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 6 Apr 2021 22:36:10 +0200
Subject: [PATCH] Make readiness and tests parameters optional, add postTests

---
 nixproc/test-driver/agnostic.nix | 37 ++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/nixproc/test-driver/agnostic.nix b/nixproc/test-driver/agnostic.nix
index 86c5b9f..ceb41ce 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, tests}:
+  testSystemVariantForProcessManager = {processManager, profileSettings, exprFile, extraParams ? {}, nixosConfig ? null, systemPackages ? [], initialTests ? null, readiness ? null, tests ? null, postTests ? null}:
     let
       processManagerModule = builtins.getAttr processManager processManagerModules;
 
@@ -63,20 +63,24 @@ let
         + pkgs.lib.optionalString (initialTests != null) (initialTests processManagerSettings.params)
 
         # Execute readiness check for all process instances
-        + pkgs.lib.concatMapStrings (instanceName:
-          let
-            instance = builtins.getAttr instanceName processes;
-          in
-          readiness ({ inherit instanceName instance; } // processManagerSettings.params)
-        ) (builtins.attrNames processes)
+        + pkgs.lib.optionalString (readiness != null)
+            (pkgs.lib.concatMapStrings (instanceName:
+              let
+                instance = builtins.getAttr instanceName processes;
+              in
+              readiness ({ inherit instanceName instance; } // processManagerSettings.params)
+            ) (builtins.attrNames processes))
 
         # Execute tests for all process instances
-        + pkgs.lib.concatMapStrings (instanceName:
-          let
-            instance = builtins.getAttr instanceName processes;
-          in
-          tests ({ inherit instanceName instance; } // processManagerSettings.params)
-        ) (builtins.attrNames processes);
+        + pkgs.lib.optionalString (tests != null)
+            (pkgs.lib.concatMapStrings (instanceName:
+              let
+                instance = builtins.getAttr instanceName processes;
+              in
+              tests ({ inherit instanceName instance; } // processManagerSettings.params)
+            ) (builtins.attrNames processes))
+
+        + pkgs.lib.optionalString (postTests != null) (postTests processManagerSettings.params);
     };
 in
 { processManagers
@@ -86,8 +90,9 @@ in
 , nixosConfig ? null
 , systemPackages ? []
 , initialTests ? null
-, readiness
-, tests
+, readiness ? null
+, tests ? null
+, postTests ? null
 }:
 
 pkgs.lib.genAttrs profiles (profile:
@@ -97,7 +102,7 @@ pkgs.lib.genAttrs profiles (profile:
   in
   pkgs.lib.genAttrs processManagers (processManager:
     testSystemVariantForProcessManager {
-      inherit processManager profileSettings exprFile extraParams nixosConfig systemPackages initialTests readiness tests;
+      inherit processManager profileSettings exprFile extraParams nixosConfig systemPackages initialTests readiness tests postTests;
     }
   )
 )