Skip to content

nixos/testing: Add test attribute to please discoverTests #423272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfgangwalther merged 2 commits into from
Jul 8, 2025
Merged

nixos/testing: Add test attribute to please discoverTests #423272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0295ad1
nixos/all-tests: Use ? in discoverTests
roberth Jul 7, 2025
0e32661
nixos/testing: Add test attribute to please discoverTests
roberth Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions nixos/lib/testing/run.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ in
# useful for inspection (debugging / exploration)
passthru.config = config;

/**
For discoverTests only. Deprecated. Will be removed when discoverTests can be removed from NixOS all-tests.nix.
*/
passthru.test = config.test;

# Docs: nixos/doc/manual/development/writing-nixos-tests.section.md
/**
See https://nixos.org/manual/nixos/unstable#sec-override-nixos-test
Expand Down
4 changes: 3 additions & 1 deletion nixos/tests/all-tests.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
with pkgs.lib;

let
# TODO: remove when handleTest is gone (make sure nixosTests and nixos/release.nix#tests are unaffected)
# TODO: when removing, also deprecate `test` attribute in ../lib/testing/run.nix
discoverTests =
val:
if isAttrs val then
if hasAttr "test" val then
if (val ? test) then
callTest val
else
mapAttrs (n: s: if n == "passthru" then s else discoverTests s) val
Expand Down