diff options
| author | aszlig <aszlig@nix.build> | 2022-10-03 15:48:52 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2022-10-03 16:03:18 +0200 |
| commit | 254b032319daf9a33b6501804b3268f79c4b1d32 (patch) | |
| tree | 1fa6b98408ca16c77a781ee151b300887a3d81e9 /tests | |
| parent | f249e6a0884c4db3d0faad50420257a0a7cd0049 (diff) | |
tests: Return test attr instead of option defs
Introduced by a recent change[1], all NixOS VM tests are evaluated using the NixOS module system and with [2], makeTest doesn't return a derivation anymore but the .config attribute of the module system evaluation. This however doesn't work very well when thrown into Hydra, which traverses through all attributes recursively looking for derivations. We had our fair share of OOMs on our Hydra evaluator and right now, some jobsets are still getting evaluation timouts, one of them is due to the fact that we use makeTest without returning the actual test derivation. [1]: https://github.com/NixOS/nixpkgs/pull/191540 [2]: https://github.com/NixOS/nixpkgs/commit/aed1deab0574f663be2d401861b Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/make-test.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/make-test.nix b/tests/make-test.nix index 39586932..5a365e8d 100644 --- a/tests/make-test.nix +++ b/tests/make-test.nix @@ -32,4 +32,4 @@ testFun: nodes = lib.mapAttrs injectCommon nodes; }; -in testLib.makeTest testArgsWithCommon +in (testLib.makeTest testArgsWithCommon).test |