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

Jump to bottom

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

blitz
blitz suggested changes Jan 26, 2020
View reviewed changes
nixos/tests/buildbot.nix Show resolved Hide resolved
nixos/tests/proxy.nix Outdated Show resolved Hide resolved
@tfc tfc mentioned this pull request Jan 26, 2020
Merged
10 tasks
@tfc
Copy link
Contributor Author

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 commented Jan 26, 2020

@GrahamcOfBorg test ihatemoney buildbot

@tfc tfc mentioned this pull request Jan 26, 2020
Closed
@tfc
Copy link
Contributor Author

tfc commented Jan 26, 2020

@GrahamcOfBorg test keymap

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

tfc commented Jan 27, 2020

@GrahamcOfBorg test ihatemoney keymap buildbot

@worldofpeace worldofpeace added this to the 20.03 milestone Jan 30, 2020
worldofpeace
worldofpeace approved these changes Jan 31, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment •
edited

Choose a reason for hiding this comment

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

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.

@flokli
Copy link
Contributor

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
Contributor

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 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.

flokli
flokli reviewed Feb 1, 2020
View reviewed changes
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
Contributor

@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
Copy link
Contributor Author

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 commented Feb 2, 2020

@GrahamcOfBorg test keymap

@flokli
Copy link
Contributor

flokli commented Feb 2, 2020

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

@flokli
Copy link
Contributor

flokli commented Feb 2, 2020

@GrahamcOfBorg test keymap

@flokli flokli merged commit 0ec03e1 into NixOS:master Feb 2, 2020
@tfc tfc deleted the port-tests branch February 2, 2020 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli left review comments

@worldofpeace worldofpeace worldofpeace approved these changes

@jonringer jonringer Awaiting requested review from jonringer

@adisbladis adisbladis Awaiting requested review from adisbladis

@blitz blitz Awaiting requested review from blitz

Assignees
No one assigned
Labels
6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
20.03
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tfc @flokli @worldofpeace @blitz