Unverified Commit 14a822f7 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #196281 from hercules-ci/restore-nixos-test-dx 

nixos: Restore test DX
parents 3f6e8439 1d9b9130

nixos/lib/testing-python.nix

+8 −2
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ rec { 
    };

  };



  # Make a full-blown test

  # Make a full-blown test (legacy)

  # For an official public interface to the tests, see

  # https://nixos.org/manual/nixos/unstable/index.html#sec-calling-nixos-tests

  makeTest =

    { machine ? null

    , nodes ? {}
@@ -48,7 +50,8 @@ rec { 
          else builtins.unsafeGetAttrPos "testScript" t)

    , extraPythonPackages ? (_ : [])

    , interactive ? {}

    } @ t:

    } @ t: let

    testConfig =

      (evalTest {

        imports = [

          { _file = "makeTest parameters"; config = t; }
@@ -60,6 +63,9 @@ rec { 
          }

        ];

      }).config;

    in

      testConfig.test   # For nix-build

        // testConfig;  # For all-tests.nix



  simpleTest = as: (makeTest as).test;

nixos/lib/testing/nodes.nix

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ in 
    nodesCompat =

      mapAttrs

        (name: config: config // {

          config = lib.warn

          config = lib.warnIf (lib.isInOldestRelease 2211)

            "Module argument `nodes.${name}.config` is deprecated. Use `nodes.${name}` instead."

            config;

        })

nixos/tests/make-test-python.nix

+1 −3
Original line number Diff line number Diff line
@@ -6,6 +6,4 @@ f: { 


with import ../lib/testing-python.nix { inherit system pkgs; };



let testConfig = makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f);

in testConfig.test   # For nix-build

     // testConfig   # For all-tests.nix
 
makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f)