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

os-prober: add test and update #62904

Merged
merged 9 commits into from Sep 16, 2019
Merged

os-prober: add test and update #62904

merged 9 commits into from Sep 16, 2019

Conversation

symphorien
Copy link
Member

Motivation for this change

Update, and add a test to check that updates do not introduce regressions.
The update should be a noop (it only touches debian specific files: https://salsa.debian.org/installer-team/os-prober/compare/1.76...1.77)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Member

@Ekleog Ekleog left a comment

Choose a reason for hiding this comment

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

LGTM! Just a few formatting nits :)

nixos/tests/os-prober.nix Outdated Show resolved Hide resolved
nixos/tests/os-prober.nix Outdated Show resolved Hide resolved
nixos/tests/os-prober.nix Outdated Show resolved Hide resolved
nixos/tests/os-prober.nix Outdated Show resolved Hide resolved
nixos/tests/os-prober.nix Outdated Show resolved Hide resolved

testScript = ''
# hack to add the secondary disk
$machine->{startCommand} = "QEMU_OPTS=\"\$QEMU_OPTS \"${lib.escapeShellArg QEMU_OPTS} ".$machine->{startCommand};
Copy link
Member

Choose a reason for hiding this comment

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

This is sad but would require some relatively large refactoring to be able to cleanly set that from the test file. 👍 for me to merge with the hack for the time being, but maybe add a comment stating that as a todo?

symphorien and others added 6 commits June 9, 2019 19:11
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
os-prober should be able to probe unmounted filesystems
@Ekleog
Copy link
Member

Ekleog commented Sep 16, 2019

Ofborg appears to be down, merging without a last check-up ofborg run.

@Ekleog Ekleog merged commit a02303f into NixOS:master Sep 16, 2019
@symphorien symphorien deleted the os-prober-test branch March 21, 2020 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants