Skip to content

nixosTests.nix-misc: split from nixosTests.misc#315927

Merged
Mic92 merged 5 commits into
NixOS:masterfrom
Artturin:movetestsnix1
Jun 4, 2024
Merged

nixosTests.nix-misc: split from nixosTests.misc#315927
Mic92 merged 5 commits into
NixOS:masterfrom
Artturin:movetestsnix1

Conversation

@Artturin
Copy link
Copy Markdown
Member

@Artturin Artturin commented May 30, 2024 •
edited
Loading

Bit weird to have nix tests in misc

Description of changes

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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.

Add a 👍 reaction to pull requests you find important.

@Artturin Artturin mentioned this pull request May 30, 2024
Closed
13 tasks
@github-actions github-actions Bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label May 30, 2024
Artturin and others added 4 commits May 30, 2024 19:11
@Artturin
nixosTests.nix-misc: Split from nixosTests.misc
e124b02 
Bit weird to have nix tests in misc

Add `artturin` to maintainers
@Artturin
nixosTests.misc: Revert nix changes
53a2215 
nix tests now moved to `nixosTests.nix-misc`

Revert "nixos/tests/misc: support old and new path-info output structure"

This reverts commit 903f315.

Revert "nixos/tests/misc: call the tester `test` to be `callTest`-ed"

This reverts commit b35ccb7.

Revert "nixos/tests/misc: rework and take ownership"

This reverts commit 81854ca.
@Artturin
nixosTests.misc: Remove nix tests
e60c483 
Moved to `nixosTests.nix-misc`
@Mic92 @Artturin
nixVersions.stable: reference nix-misc in tests
4c289e9 
This is a regression test for nix.
Artturin
Artturin commented May 30, 2024
View reviewed changes
Comment thread pkgs/tools/package-management/lix/common.nix
Artturin
Artturin commented May 30, 2024
View reviewed changes
Comment thread nixos/tests/nix/misc.nix
let
foo = pkgs.writeText "foo" "Hello World";
in {
name = "${nixPackage.pname}-misc";
Copy link
Copy Markdown
Member Author

@Artturin Artturin May 30, 2024

Choose a reason for hiding this comment

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

Uses pname now

Mic92
Mic92 approved these changes May 30, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

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

I like this more than my attempt. Haven't tested anything beyond an eye-ball test.

@vcunat
Copy link
Copy Markdown
Member

vcunat commented May 30, 2024

This doesn't add the new test as a channel blocker anywhere. Might be worth considering.

@ofborg ofborg Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 30, 2024
@ofborg ofborg Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 30, 2024
@Artturin
Copy link
Copy Markdown
Member Author

Artturin commented Jun 2, 2024 •
edited
Loading

@RaitoBezarius Can you review?

RaitoBezarius
RaitoBezarius approved these changes Jun 2, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

Looks good to me! Thank you!

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Jun 2, 2024
@Mic92 Mic92 merged commit 7c503a8 into NixOS:master Jun 4, 2024
@Mic92 Mic92 mentioned this pull request Jun 4, 2024
Closed
13 tasks
@mweinelt
Copy link
Copy Markdown
Member

mweinelt commented Jun 4, 2024 •
edited
Loading

This broke eval, because the misc test wasn't removed from the tested set.

{UNKNOWN}: aggregate job ‘tested’ failed with the error: nixos.tests.misc.default.x86_64-linux: does not exist
nixos.tests.misc.default.aarch64-linux: does not exist
 at /nix/store/fncb6n480apg2y1jdzf94ivlw9dd88nr-hydra-perl-deps/lib/perl5/site_perl/5.38.2/Catalyst/Model/DBIC/Schema.pm line 526

@Artturin
Copy link
Copy Markdown
Member Author

Artturin commented Jun 4, 2024

This broke eval, because the misc test wasn't removed from the tested set.

{UNKNOWN}: aggregate job ‘tested’ failed with the error: nixos.tests.misc.default.x86_64-linux: does not exist
nixos.tests.misc.default.aarch64-linux: does not exist
 at /nix/store/fncb6n480apg2y1jdzf94ivlw9dd88nr-hydra-perl-deps/lib/perl5/site_perl/5.38.2/Catalyst/Model/DBIC/Schema.pm line 526

Ah just .default suffix has to be removed

@Mic92
Copy link
Copy Markdown
Member

Mic92 commented Jun 4, 2024

@Artturin @mweinelt https://github.com/NixOS/nixpkgs/pull/317172/files

@Artturin Artturin deleted the movetestsnix1 branch June 4, 2024 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RaitoBezarius RaitoBezarius RaitoBezarius approved these changes

@Mic92 Mic92 Mic92 approved these changes

@Ma27 Ma27 Awaiting requested review from Ma27

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Artturin @vcunat @mweinelt @Mic92 @RaitoBezarius @wegank