You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bd...@apache.org on 2020/08/26 20:56:58 UTC

[cassandra-dtest] branch master updated: CASSANDRA-15899 - fix repair_admin tests

This is an automated email from the ASF dual-hosted git repository.

bdeggleston pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git


The following commit(s) were added to refs/heads/master by this push:
     new e8b48f5  CASSANDRA-15899 - fix repair_admin tests
e8b48f5 is described below

commit e8b48f5fe8c097ccb0037c14f5332659c58bdeb3
Author: Blake Eggleston <bd...@gmail.com>
AuthorDate: Wed Aug 26 13:35:50 2020 -0700

    CASSANDRA-15899 - fix repair_admin tests
---
 repair_tests/incremental_repair_test.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/repair_tests/incremental_repair_test.py b/repair_tests/incremental_repair_test.py
index e379355..c8e7024 100644
--- a/repair_tests/incremental_repair_test.py
+++ b/repair_tests/incremental_repair_test.py
@@ -231,10 +231,10 @@ class TestIncRepair(Tester):
             assert re.match(str(session_id), line)
             assert "REPAIRING" in line
 
-        node1.nodetool("repair_admin --cancel {}".format(session_id))
+        node1.nodetool("repair_admin cancel --session {}".format(session_id))
 
         for node in self.cluster.nodelist():
-            out = node.nodetool('repair_admin --all')
+            out = node.nodetool('repair_admin list --all')
             lines = out.stdout.split('\n')
             assert len(lines) > 1
             line = lines[1]
@@ -272,7 +272,7 @@ class TestIncRepair(Tester):
             assert "REPAIRING" in line
 
         try:
-            node2.nodetool("repair_admin --cancel {}".format(session_id))
+            node2.nodetool("repair_admin --cancel --session {}".format(session_id))
             self.fail("cancel from a non coordinator should fail")
         except ToolError:
             pass  # expected
@@ -315,10 +315,10 @@ class TestIncRepair(Tester):
             assert re.match(str(session_id), line)
             assert "REPAIRING" in line
 
-        node2.nodetool("repair_admin --cancel {} --force".format(session_id))
+        node2.nodetool("repair_admin cancel --session {} --force".format(session_id))
 
         for node in self.cluster.nodelist():
-            out = node.nodetool('repair_admin --all')
+            out = node.nodetool('repair_admin list --all')
             lines = out.stdout.split('\n')
             assert len(lines) > 1
             line = lines[1]


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org