ehmry
/
nix-processmgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make readiness and tests parameters optional, add postTests

This commit is contained in:
Sander van der Burg 2021-04-06 22:36:10 +02:00 committed by Sander van der Burg
parent 4af0f746a8
commit d45f205a90
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nixproc/test-driver/agnostic.nix
View File

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