Skip to content

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

Merged
wolfgangwalther merged 2 commits intoNixOS:masterfrom
roberth:expletive-discoverTests-expletive
Jul 8, 2025
Merged

nixos/testing: Add test attribute to please discoverTests#423272
wolfgangwalther merged 2 commits intoNixOS:masterfrom
roberth:expletive-discoverTests-expletive

Conversation

@roberth
Copy link
Member

@roberth roberth commented Jul 7, 2025

This makes it a happy lambda again:

$ nix eval --impure --expr 'with import ./. {}; bind.tests.kubernetes-dns-multi-node.extend'
«lambda extend @ /home/user/src/nixpkgs-master/nixos/lib/testing/call-test.nix:31:7»

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: testing Tooling for automated testing of packages and modules 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Jul 7, 2025
@roberth roberth force-pushed the expletive-discoverTests-expletive branch from 1792768 to 474e1c8 Compare July 7, 2025 19:12
Copy link
Contributor

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff looks good. I've not tested if this resolved the reported issue.

@nixpkgs-ci nixpkgs-ci bot added 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 12.approvals: 1 This PR was reviewed and approved by one person. and removed 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Jul 7, 2025
Copy link
Contributor

@wolfgangwalther wolfgangwalther left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM; but I can't tell whether it's enough, or whether there are any other cases that will still throw similarly.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jul 7, 2025
@roberth roberth force-pushed the expletive-discoverTests-expletive branch from 474e1c8 to 33d3bf5 Compare July 7, 2025 20:23
@roberth roberth force-pushed the expletive-discoverTests-expletive branch from 33d3bf5 to 0e32661 Compare July 7, 2025 20:24
@wolfgangwalther
Copy link
Contributor

@trofi can you run your script on this branch again and see whether there are any other regressions from that PR?

@trofi
Copy link
Contributor

trofi commented Jul 8, 2025

@trofi can you run your script on this branch again and see whether there are any other regressions from that PR?

No regressions.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Jul 8, 2025
@wolfgangwalther wolfgangwalther changed the title Try work around discoverTests again. nixos/testing: Add test attribute to please discoverTests Jul 8, 2025
@wolfgangwalther wolfgangwalther merged commit 23dc568 into NixOS:master Jul 8, 2025
26 of 30 checks passed
@wolfgangwalther
Copy link
Contributor

@trofi I saw your approval was gray not green, indicating you're not a committer. My journey ultimately lead me to NixOS/nixpkgs-committers#60 (comment) - and I wanted to ask whether your situation has maybe changed today? Your activity on GitHub and Nixpkgs seems to indiciate - to me - that maybe, hopefully, that could be the case.

@trofi
Copy link
Contributor

trofi commented Jul 8, 2025

No, no improvement. It's actually the other way around: I had to cut down a few more nixpkgs activities I used to have more time for.

@roberth roberth deleted the expletive-discoverTests-expletive branch July 8, 2025 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: testing Tooling for automated testing of packages and modules 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants