Skip to content

Commit

Permalink
Merge #40867
Browse files Browse the repository at this point in the history
40867: cli/interactive_tests: deflake and accelerate test_multiple_nodes r=knz a=knz

Release justification: deflakes a test and makes CI run faster

Prior to this patch the test would attempt to shut down the cluster
gracefully after asserting that the 3 nodes are properly joined.

Unfortunately this wait is running into separate issue
#40834 and this makes
the test clean-up flaky.

Since this unit test is not about quitting a cluster but merely
checking that the join is successful, this patch both works around the
related issue and accelerates the test by simply killing the nodes.

Release note: None

Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
  • Loading branch information
craig[bot] and knz committed Sep 18, 2019
2 parents 6c508db + 2b06530 commit 7dc9594
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions pkg/cli/interactive_tests/test_multiple_nodes.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ eexpect id
eexpect "3 rows"
eexpect eof

# Remove the additional nodes.
system "$argv quit --port=26258"
system "$argv quit --port=26259"

end_test

stop_server $argv
# Kill the cluster. We don't care about what happens next in this test,
# and this makes the test complete faster.
system "kill -KILL `cat server_pid` `cat server_pid2` `cat server_pid3`"

0 comments on commit 7dc9594

Please sign in to comment.