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

nixosTests: Port more tests #78556

Merged
merged 3 commits into from Feb 2, 2020
Merged

nixosTests: Port more tests #78556

merged 3 commits into from Feb 2, 2020

Conversation

@tfc
Copy link
Contributor

@tfc tfc commented Jan 26, 2020

Motivation for this change

#72828

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.

cc @flokli @worldofpeace

nixos/tests/buildbot.nix Show resolved Hide resolved
nixos/tests/proxy.nix Outdated Show resolved Hide resolved
@tfc tfc force-pushed the tfc:port-tests branch from b4f9983 to 8ae29a7 Jan 26, 2020
@tfc tfc force-pushed the tfc:port-tests branch from 8ae29a7 to 5e63e49 Jan 26, 2020
@tfc
Copy link
Contributor Author

@tfc tfc commented Jan 26, 2020

removed the proxy test because of utf problems and moved it to PR #78555 where this is fixed.

@tfc
Copy link
Contributor Author

@tfc tfc commented Jan 26, 2020

@GrahamcOfBorg test ihatemoney buildbot

@tfc
Copy link
Contributor Author

@tfc tfc commented Jan 26, 2020

@GrahamcOfBorg test keymap

nixos/tests/buildbot.nix Show resolved Hide resolved
nixos/tests/ihatemoney.nix Show resolved Hide resolved
@tfc tfc force-pushed the tfc:port-tests branch 2 times, most recently from bd17460 to 01a0fcc Jan 27, 2020
@tfc
Copy link
Contributor Author

@tfc tfc commented Jan 27, 2020

@GrahamcOfBorg test ihatemoney keymap buildbot

@blitz
blitz approved these changes Jan 28, 2020
@tfc tfc requested review from jonringer, adisbladis and blitz Jan 29, 2020
@worldofpeace worldofpeace added this to the 20.03 milestone Jan 30, 2020
Copy link
Member

@worldofpeace worldofpeace left a comment

I've reviewed

  • buildbot.nix
  • ihatemoney.nix

and I'm pretty confident in them.

I did look over the testScript in keymap.nix and it looks fine, but the quoting stuff is a bit fuzzy for me. So I think someone more familiar with that specific test should look at it.

@tfc tfc force-pushed the tfc:port-tests branch from 01a0fcc to 6035c45 Jan 31, 2020
@flokli
Copy link
Contributor

@flokli flokli commented Jan 31, 2020

I really appreciate the porting effort. But as I already explained in some other "bulk PRs", if this would have been 3 separate PRs, it'd be much easier to just merge the two reviewed ones.

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 31, 2020

I really appreciate the porting effort. But as I already explained in some other "bulk PRs", if this would have been 3 separate PRs, it'd be much easier to just merge the two reviewed ones.

True. This is how I've been doing my own PRs so they don't get blocked.
For example, the two tests I mentioned I'm confident in, but are blocked by the third.

@tfc
Copy link
Contributor Author

@tfc tfc commented Feb 1, 2020

@flokli @worldofpeace Currently it is the most comfortable workflow for me to sit down for an hour before or after work, port 1-3 tests, open a PR for them and this is how it happens.

But you're right, one test per PR has mentioned advantages and i will do it like that in the future.

nixos/tests/keymap.nix Outdated Show resolved Hide resolved
nixos/tests/keymap.nix Outdated Show resolved Hide resolved
nixos/tests/keymap.nix Show resolved Hide resolved
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 1, 2020

@flokli @worldofpeace Currently it is the most comfortable workflow for me to sit down for an hour before or after work, port 1-3 tests, open a PR for them and this is how it happens.

But you're right, one test per PR has mentioned advantages and i will do it like that in the future.

And we totally appreciate that as well 🎊

@tfc tfc force-pushed the tfc:port-tests branch from 6035c45 to c633014 Feb 2, 2020
@tfc
Copy link
Contributor Author

@tfc tfc commented Feb 2, 2020

@flokli you were right, i pythonified the whole thing and it looks a bit more structured now.

@tfc
Copy link
Contributor Author

@tfc tfc commented Feb 2, 2020

@GrahamcOfBorg test keymap

@tfc tfc force-pushed the tfc:port-tests branch from c633014 to 5ae9820 Feb 2, 2020
@flokli
Copy link
Contributor

@flokli flokli commented Feb 2, 2020

@tfc Thanks! This is much more understandable now :-)

@flokli
Copy link
Contributor

@flokli flokli commented Feb 2, 2020

@GrahamcOfBorg test keymap

@flokli flokli merged commit 0ec03e1 into NixOS:master Feb 2, 2020
4 of 6 checks passed
4 of 6 checks passed
grahamcofborg-eval Beginning Evaluations
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
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
tests.keymap on aarch64-linux Success
Details
tests.keymap on x86_64-linux Success
Details
@tfc tfc deleted the tfc:port-tests branch Feb 2, 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

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