Skip to content

nixosTests/cosmic: move core logic into a dedicated script - #519448

Merged
OPNA2608 merged 4 commits into
NixOS:masterfrom
thefossguy:cosmic-test-improvement
Jun 22, 2026
Merged

nixosTests/cosmic: move core logic into a dedicated script#519448
OPNA2608 merged 4 commits into
NixOS:masterfrom
thefossguy:cosmic-test-improvement

Conversation

@thefossguy

@thefossguy thefossguy commented May 12, 2026

Copy link
Copy Markdown
Member

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

@thefossguy
thefossguy requested a review from a team May 12, 2026 14:32
@thefossguy thefossguy mentioned this pull request May 12, 2026
Merged
13 tasks
@thefossguy

thefossguy commented May 12, 2026

Copy link
Copy Markdown
Member Author

At the moment, the test fails because I added a new test for handling polkit degradation in the second commit.

But, once I apply https://github.com/pop-os/cosmic-osd/commit/cb9698c8536df05b7086115a071a3d3838b245f2.patch?full_index=1 to cosmic-osd, this new test passes.

@thefossguy

thefossguy commented May 12, 2026

Copy link
Copy Markdown
Member Author

Part of #508829

@nixpkgs-ci nixpkgs-ci 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. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: COSMIC COSMIC is a software platform for designing beautiful user experiences labels May 12, 2026
@a-kenji

a-kenji commented May 12, 2026

Copy link
Copy Markdown
Member

Maybe create a nixos/tests/cosmic/* directory in this PR or a follow up?

@thefossguy

thefossguy commented May 12, 2026

Copy link
Copy Markdown
Member Author

I'm up for whatever we decide. Do we have any official guidelines on this?

@thefossguy

thefossguy commented May 12, 2026

Copy link
Copy Markdown
Member Author

Additionally, I'd like to wait at least today before merging to see if upstream tags a new release. That way, we can get the cosmic-osd fix in, and can confidently verify that none of the tests fail.

@salva09

salva09 commented May 13, 2026

Copy link
Copy Markdown
Contributor

I created #519587 for the tagged release that should have the cosmic-osd fix. Is there a way I could run the new test?

@thefossguy
thefossguy marked this pull request as draft May 13, 2026 02:02
@a-kenji

a-kenji commented May 13, 2026

Copy link
Copy Markdown
Member

I'm up for whatever we decide. Do we have any official guidelines on this?

I would guess its OK to just do it.

@thefossguy
thefossguy force-pushed the cosmic-test-improvement branch 2 times, most recently from 11f2f8e to 4c4b064 Compare May 14, 2026 07:40
@thefossguy thefossguy changed the title nixosTests/cosmic: move NixOS VM test's core logic from testScript into dedicated script nixosTests/cosmic: move core logic into a dedicated script May 16, 2026
@thefossguy
thefossguy force-pushed the cosmic-test-improvement branch from 4c4b064 to be7d86b Compare May 16, 2026 06:21
@thefossguy
thefossguy marked this pull request as ready for review May 16, 2026 06:21
@thefossguy

thefossguy commented May 16, 2026

Copy link
Copy Markdown
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 519448 --extra-nixpkgs-config '{ allowBroken = false; }' --additional-package nixosTests.cosmic-noxwayland --additional-package nixosTests.cosmic-autologin --additional-package nixosTests.cosmic --additional-package nixosTests.cosmic-autologin-noxwayland
Commit: be7d86b57f927b91333fc691590a3db898581a91

x86_64-linux

✅ 4 tests built:
  • nixosTests.cosmic
  • nixosTests.cosmic-autologin
  • nixosTests.cosmic-autologin-noxwayland
  • nixosTests.cosmic-noxwayland

@thefossguy

thefossguy commented May 16, 2026

Copy link
Copy Markdown
Member Author

For some reason, the tests now fail on aarch64-linux. Digging into it.

@thefossguy
thefossguy marked this pull request as draft May 18, 2026 16:33
@thefossguy
thefossguy force-pushed the cosmic-test-improvement branch 3 times, most recently from 449fde1 to 26087cf Compare May 19, 2026 14:07
@thefossguy

thefossguy commented May 19, 2026

Copy link
Copy Markdown
Member Author

Aha, the tests were failing on aarch64 because software rending was too slow for cosmic-osd's pop-up dialog to render. Added a few more guardrails as well.

@thefossguy
thefossguy marked this pull request as ready for review May 19, 2026 14:15
@thefossguy

thefossguy commented May 19, 2026

Copy link
Copy Markdown
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 519448 --extra-nixpkgs-config '{ allowBroken = false; }' --additional-package nixosTests.cosmic-autologin --additional-package nixosTests.cosmic-noxwayland --additional-package nixosTests.cosmic-autologin-noxwayland --additional-package nixosTests.cosmic
Commit: 26087cf158dfc13702b84316f2593f13b726d128

aarch64-linux

✅ 4 tests built:
  • nixosTests.cosmic
  • nixosTests.cosmic-autologin
  • nixosTests.cosmic-autologin-noxwayland
  • nixosTests.cosmic-noxwayland

@thefossguy

thefossguy commented May 19, 2026

Copy link
Copy Markdown
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 519448 --extra-nixpkgs-config '{ allowBroken = false; }' --additional-package nixosTests.cosmic-noxwayland --additional-package nixosTests.cosmic-autologin-noxwayland --additional-package nixosTests.cosmic --additional-package nixosTests.cosmic-autologin
Commit: 26087cf158dfc13702b84316f2593f13b726d128

x86_64-linux

✅ 4 tests built:
  • nixosTests.cosmic
  • nixosTests.cosmic-autologin
  • nixosTests.cosmic-autologin-noxwayland
  • nixosTests.cosmic-noxwayland

@thefossguy
thefossguy force-pushed the cosmic-test-improvement branch from 26087cf to 7b412cc Compare May 20, 2026 08:25
@thefossguy
thefossguy force-pushed the cosmic-test-improvement branch from 1e52b74 to f22ebc3 Compare June 10, 2026 10:35
@thefossguy

thefossguy commented Jun 10, 2026

Copy link
Copy Markdown
Member Author

Hah! ydotool required the absolute path because I was specifying the env argument to subprocess.run() and that was overriding $PATH.

Addressed all concerns that were raised, and rebased on top of master.

@thefossguy

thefossguy commented Jun 10, 2026

Copy link
Copy Markdown
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 519448 --extra-nixpkgs-config '{ allowBroken = true; allowUnfree = true; }' --additional-package nixosTests.cosmic --additional-package nixosTests.cosmic-noxwayland --additional-package nixosTests.cosmic-autologin --additional-package nixosTests.cosmic-autologin-noxwayland
Commit: f22ebc3174cb8ad40689f6fdca650040f578ed39

aarch64-linux

✅ 4 tests built:
  • nixosTests.cosmic
  • nixosTests.cosmic-autologin
  • nixosTests.cosmic-autologin-noxwayland
  • nixosTests.cosmic-noxwayland
✅ 1 package built:
  • empty-pdf

@thefossguy

thefossguy commented Jun 10, 2026

Copy link
Copy Markdown
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 519448 --extra-nixpkgs-config '{ allowBroken = true; allowUnfree = true; }' --additional-package nixosTests.cosmic-autologin --additional-package nixosTests.cosmic-noxwayland --additional-package nixosTests.cosmic-autologin-noxwayland --additional-package nixosTests.cosmic
Commit: f22ebc3174cb8ad40689f6fdca650040f578ed39

x86_64-linux

✅ 4 tests built:
  • nixosTests.cosmic
  • nixosTests.cosmic-autologin
  • nixosTests.cosmic-autologin-noxwayland
  • nixosTests.cosmic-noxwayland
✅ 1 package built:
  • empty-pdf

@thefossguy

thefossguy commented Jun 10, 2026

Copy link
Copy Markdown
Member Author

@alyssais is there something you feel that is blocking this PR from getting merged?

GaetanLepage
GaetanLepage reviewed Jun 10, 2026
View reviewed changes
Comment thread pkgs/by-name/em/empty-pdf/package.nix Outdated
Comment thread pkgs/by-name/em/empty-pdf/package.nix
@thefossguy
thefossguy force-pushed the cosmic-test-improvement branch from f22ebc3 to 6efd59e Compare June 11, 2026 07:14
@thefossguy
thefossguy requested a review from GaetanLepage June 11, 2026 07:14
@thefossguy
thefossguy force-pushed the cosmic-test-improvement branch from 6efd59e to 5b01aec Compare June 11, 2026 07:15
@thefossguy thefossguy mentioned this pull request Jun 12, 2026
Closed
14 tasks
@thefossguy

thefossguy commented Jun 16, 2026

Copy link
Copy Markdown
Member Author

IMHO this PR has gone 3+ cosmic releases without being merged and I'd appreciate to be made aware of any concerns preventing a merge.

@a-kenji
a-kenji requested a review from jopejoe1 June 16, 2026 06:51
@thefossguy
thefossguy requested a review from philiptaron June 22, 2026 04:38
@thefossguy

thefossguy commented Jun 22, 2026

Copy link
Copy Markdown
Member Author

New tags are expected tomorrow. Can we please do something about this PR?

@OPNA2608
OPNA2608 added this pull request to the merge queue Jun 22, 2026
Merged via the queue into NixOS:master with commit 5e4170d Jun 22, 2026
26 checks passed
@GaetanLepage

GaetanLepage commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

New tags are expected tomorrow. Can we please do something about this PR?

Sorry, I couldn't find the time to give this a proper review in time.
Thanks @OPNA2608 for doing so!
And thanks @thefossguy for pushing this through :)

@thefossguy

thefossguy commented Jun 22, 2026

Copy link
Copy Markdown
Member Author

Thank you for your help on this PR, @OPNA2608! I appreciate it a lot!

@thefossguy thefossguy mentioned this pull request Jun 24, 2026
Closed
@thefossguy
thefossguy deleted the cosmic-test-improvement branch June 24, 2026 07:27
@thefossguy thefossguy added the backport release-26.05 Backport PR automatically label Jun 26, 2026
@nixpkgs-ci nixpkgs-ci Bot mentioned this pull request Jun 26, 2026
Merged
@nixpkgs-ci

nixpkgs-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Successfully created backport PR for release-26.05:

@github-actions github-actions Bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alyssais alyssais Awaiting requested review from alyssais
@GaetanLepage GaetanLepage Awaiting requested review from GaetanLepage
@jopejoe1 jopejoe1 Awaiting requested review from jopejoe1
@philiptaron philiptaron Awaiting requested review from philiptaron
3 more reviewers
@nyabinary nyabinary nyabinary approved these changes
@Pandapip1 Pandapip1 Pandapip1 approved these changes
@a-kenji a-kenji a-kenji approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: COSMIC COSMIC is a software platform for designing beautiful user experiences 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons. backport release-26.05 Backport PR automatically

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@thefossguy @a-kenji @salva09 @alyssais @Pandapip1 @GaetanLepage @nyabinary @OPNA2608