Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fish: fix and enable `fishConfig` test #86802

Merged
merged 1 commit into from May 4, 2020
Merged

fish: fix and enable `fishConfig` test #86802

merged 1 commit into from May 4, 2020

Conversation

@cole-h
Copy link
Member

cole-h commented May 4, 2020

nix-build -A fish.tests.fishConfig will now test that the
fish_config tool would start up properly. Previously, this test was
effectively disabled due to withTests being stubbed out.

I don't think this test ever truly worked, because the generated
temporary file would be cleaned up automatically (or maybe this
"automatically" changed between versions). The solution to this is to
add delete=False to the NamedTemporaryFile function call, to keep
the temporary file around in order to grep its contents for the expected
output.

Motivation for this change

The test had been effectively disabled for a long time.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Is there any way to avoid having the derivation for fish itself be let-bound? It certainly makes it easier for the fishConfig test to refer to paths inside the derivation, but I wonder if there's a better way.

`nix-build -A fish.tests.fishConfig` will now test that the
`fish_config` tool would start up properly. Previously, this test was
effectively disabled due to `withTests` being stubbed out.

I don't think this test ever truly worked, because the generated
temporary file would be cleaned up automatically (or maybe this
"automatically" changed between versions). The solution to this is to
add `delete=False` to the `NamedTemporaryFile` function call, to keep
the temporary file around in order to grep its contents for the expected
output.
@cole-h cole-h requested a review from Profpatsch May 4, 2020
@cole-h cole-h mentioned this pull request May 4, 2020
6 of 10 tasks complete
Copy link
Member

Profpatsch left a comment

Great!

@Profpatsch
Copy link
Member

Profpatsch commented May 4, 2020

Is there any way to avoid having the derivation for fish itself be let-bound? It certainly makes it easier for the fishConfig test to refer to paths inside the derivation, but I wonder if there's a better way.

Putting it in a let is perfectly fine.

@Profpatsch Profpatsch merged commit a176302 into NixOS:master May 4, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
fish, fish.passthru.tests on aarch64-linux Success
Details
fish, fish.passthru.tests on x86_64-darwin Success
Details
fish, fish.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3789cd0"; rev="3789cd05d8006b54ccc2d4f64de1c81f31d409c8"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3789cd0"; rev="3789cd05d8006b54ccc2d4f64de1c81f31d409c8"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3789cd0"; rev="3789cd05d8006b54ccc2d4f64de1c81f31d409c8"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3789cd0"; rev="3789cd05d8006b54ccc2d4f64de1c81f31d409c8"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3789cd0"; rev="3789cd05d8006b54ccc2d4f64de1c81f31d409c8"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3789cd0"; rev="3789cd05d8006b54ccc2d4f64de1c81f31d409c8"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3789cd0"; rev="3789cd05d8006b54ccc2d4f64de1c81f31d409c8"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@cole-h cole-h deleted the cole-h:fish branch May 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.