nixos/cross-seed: create outputDir on start and re-enable test #384570
+65
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also adds an update script
github-actions
bot
added
6.topic: nixos
ofborg
bot
added
the
6.topic: cross-compilation
|
@kevincox here's the fix! As far as I could tell it's not really an issue with the sandboxing per-se, it's just a combination of a now-fixed bug in cross-seed and me forgetting to create the directory in the module. Both of those are now taken care of! |
pta2002
removed
the
6.topic: cross-compilation
kevincox
approved these changes
Feb 23, 2025
| services.cross-seed = { | ||
| enable = true; | ||
| settings = { | ||
| outputDir = "/var/lib/cross-seed/output"; |
There was a problem hiding this comment.
This is the default right? Maybe we should not set it to emphasize that we are testing with only the minimal set of required options?
kevincox
requested changes
Feb 23, 2025
| @@ -294,6 +294,7 @@ in { | |||
| curl-impersonate = handleTest ./curl-impersonate.nix {}; | |||
| custom-ca = handleTest ./custom-ca.nix {}; | |||
| croc = handleTest ./croc.nix {}; | |||
| cross-seed = runTest ./cross-seed.nix {}; | |||
There was a problem hiding this comment.
Suggested change
| cross-seed = runTest ./cross-seed.nix {}; | |
| cross-seed = runTest ./cross-seed.nix; |
The test fails to evaluate.
There was a problem hiding this comment.
Ah damn, I was running the tests before rebasing on master and then accidentally re-added it wrong 🤦
Comment on lines
+38
to
+42
| start_all() | ||
| machine.wait_for_unit("cross-seed.service") | ||
| machine.wait_for_open_port(2468) | ||
| # Check that the API is running | ||
| machine.succeed("curl --fail http://localhost:2468/api/ping?apiKey=${apiKey}") |
There was a problem hiding this comment.
This indent is broken causing the test to fail.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-enables the test removed in #384279.
The issue with the broken test was multi-faceted:
I also changed the API endpoint to the
/pingendpoint, and added an update script to the package.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.