nixos/cross-seed: create outputDir on start and re-enable test #384570
Conversation
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
nixos/tests/cross-seed.nix
Outdated
| 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?
nixos/tests/all-tests.nix
Outdated
| @@ -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.
| 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 🤦
nixos/tests/cross-seed.nix
Outdated
| 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.
|
It's now fixed @kevincox, sorry for the mess-up, screwed up the test while rebasing. I've ran the test locally and can confirm it runs correctly. |
pta2002
force-pushed
the
push-ksyqomtxumlv
branch
from
4865680 to
500a8bb
Compare
ofborg
bot
added
the
6.topic: cross-compilation
pta2002
removed
the
6.topic: cross-compilation
|
|
I'm happy to merge this if there are no objections. |
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.