summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-06-06 19:24:30 +0200
committerRobert Hensing <robert@roberthensing.nl>2022-06-06 19:24:30 +0200
commit51224f522f7a7d3a00ac2da4ceeedeea296cd2ed (patch)
treec39c592ad7b9cd09781f5ac84cda5e2333c67829 /nixos/tests
parent9a995f5c6a0b7e782017b725eb8a34ff0d7de527 (diff)
downloadnixpkgs-51224f522f7a7d3a00ac2da4ceeedeea296cd2ed.tar
nixpkgs-51224f522f7a7d3a00ac2da4ceeedeea296cd2ed.tar.gz
nixpkgs-51224f522f7a7d3a00ac2da4ceeedeea296cd2ed.tar.bz2
nixpkgs-51224f522f7a7d3a00ac2da4ceeedeea296cd2ed.tar.lz
nixpkgs-51224f522f7a7d3a00ac2da4ceeedeea296cd2ed.tar.xz
nixpkgs-51224f522f7a7d3a00ac2da4ceeedeea296cd2ed.tar.zst
nixpkgs-51224f522f7a7d3a00ac2da4ceeedeea296cd2ed.zip
nixosTests.allDrivers: Move logic to all-packages.nix
Bring it in line with release.nix
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/all-tests.nix19
1 files changed, 2 insertions, 17 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5ef2a8a8280..0f75548ff6f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -27,21 +27,7 @@ let
   };
   evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; };
 
-  allDrivers = getDrivers tests;
-
-  getDrivers = ts:
-    if isDerivation ts
-    then ts.driver or null
-    else if isAttrs ts
-    then recurseIntoAttrs (mapAttrs (k: getDrivers) ts)
-    else null;
-
-  tests = {
-
-  # for typechecking of the scripts and evaluation of
-  # the nodes, without running VMs.
-  inherit allDrivers;
-
+in {
   _3proxy = handleTest ./3proxy.nix {};
   acme = handleTest ./acme.nix {};
   adguardhome = handleTest ./adguardhome.nix {};
@@ -634,5 +620,4 @@ let
   zookeeper = handleTest ./zookeeper.nix {};
   zrepl = handleTest ./zrepl.nix {};
   zsh-history = handleTest ./zsh-history.nix {};
-};
-in tests
+}