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.cockroachdb: port to python #73934

Merged
merged 6 commits into from Apr 19, 2020
Merged

nixosTests.cockroachdb: port to python #73934

merged 6 commits into from Apr 19, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Nov 22, 2019

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 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @tfc

@flokli flokli requested a review from fpletz November 22, 2019 20:02
@tfc tfc mentioned this pull request Nov 22, 2019
Closed
@flokli flokli force-pushed the nixos-test-port-cockroachdb branch 2 times, most recently from 8add180 to fb124c5 Compare November 22, 2019 21:31
@worldofpeace
Copy link
Contributor

@GrahamcOfBorg test cockroachdb

@worldofpeace
Copy link
Contributor

Seeing sort of failure only on x86_64-linux

/nix/store/fbqss54p4xbj10zi93ywlikgij15adhr-nixos-test-driver/bin/.nixos-test-driver-wrapped:639: DeprecationWarning: invalid escape sequence '\@'
  line = _line.decode("unicode_escape").replace("\r", "").rstrip()
node1 # Error: parse postgresql://root\@192.168.1.1:26257?sslmode=disable: net/url: invalid userinfo
node1: output:
error: command `cockroach workload init bank 'postgresql://root\@192.168.1.1:26257?sslmode=disable'` failed (exit code 1)

worldofpeace
worldofpeace suggested changes Nov 23, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

I believe this is what's causing that issue, this doesn't even need to be escaped.
Tested locally.

nixos/tests/cockroachdb.nix Outdated Show resolved Hide resolved
nixos/tests/cockroachdb.nix Outdated Show resolved Hide resolved
@flokli
Copy link
Contributor Author

flokli commented Nov 23, 2019

Argh, 🤦‍♂️. Thanks for spotting that!

@flokli flokli force-pushed the nixos-test-port-cockroachdb branch 2 times, most recently from e9bd08b to 2419ecc Compare November 23, 2019 15:09
@flokli
Copy link
Contributor Author

flokli commented Nov 23, 2019

@GrahamcOfBorg test cockroachdb

@flokli
Copy link
Contributor Author

flokli commented Nov 23, 2019

For some reason, this still doesn't converge properly here - even though it kinda succeeds in the perl version. 🤔

@flokli
Copy link
Contributor Author

flokli commented Nov 23, 2019

@GrahamcOfBorg test cockroachdb

@flokli flokli force-pushed the nixos-test-port-cockroachdb branch from 4fec4bb to 0734591 Compare December 6, 2019 09:24
@flokli
Copy link
Contributor Author

flokli commented Dec 6, 2019

@GrahamcOfBorg test cockroachdb

@tfc
Copy link
Contributor

tfc commented Jan 14, 2020

@flokli what's the state of this?

@flokli
Copy link
Contributor Author

flokli commented Jan 14, 2020 via email

@tfc tfc mentioned this pull request Feb 13, 2020
Closed
10 tasks
monoidal
monoidal reviewed Apr 2, 2020
View reviewed changes
nixos/tests/cockroachdb.nix Outdated
node.start()
node.wait_for_unit("cockroachdb")
node1.succeed(
"cockroach sql --host=192.168.1.1 --insecure -e 'SHOW ALL CLUSTER SETTINGS' 2>&1"
Copy link

Choose a reason for hiding this comment

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

IIUIC, this needs , between the strings, otherwise they're concatenated.

Copy link
Contributor Author

@flokli flokli Apr 2, 2020 •
edited

Choose a reason for hiding this comment

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

nice catch! However, I still don't get the servers to sync together. It did eventually succeed!

@flokli flokli force-pushed the nixos-test-port-cockroachdb branch from 0734591 to fe6dd71 Compare April 2, 2020 22:35
@flokli
Copy link
Contributor Author

flokli commented Apr 2, 2020

I rebased this on latest master.

@flokli
Copy link
Contributor Author

flokli commented Apr 2, 2020

@GrahamcOfBorg test cockroachdb

@flokli
Copy link
Contributor Author

flokli commented Apr 2, 2020

@tfc this test works now, PTAL.

@worldofpeace worldofpeace requested a review from tfc April 8, 2020 03:42
@worldofpeace worldofpeace merged commit f882896 into NixOS:master Apr 19, 2020
@flokli flokli deleted the nixos-test-port-cockroachdb branch April 19, 2020 20:35
@ajs124 ajs124 mentioned this pull request Sep 9, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@monoidal monoidal monoidal left review comments

@tfc tfc tfc approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

@fpletz fpletz Awaiting requested review from fpletz

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice thoughtpolice is a code owner

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

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