[cassandra-dtest] branch trunk updated: Update tests for CASSANDRA-14793

[bl...@apache.org]

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 28d0a66  Update tests for CASSANDRA-14793
28d0a66 is described below

commit 28d0a668bf4f23d6b16ec47dc3f2ddab24769105
Author: Benjamin Lerer <b....@gmail.com>
AuthorDate: Mon Sep 28 14:23:44 2020 +0200

    Update tests for CASSANDRA-14793
    
    patch by Benjamin Lerer; reviewed by Andrés de la Peña and  Marcus
    Eriksson for CASSANDRA-14793
---
 disk_balance_test.py | 2 +-
 snapshot_test.py     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/disk_balance_test.py b/disk_balance_test.py
index 1c1a759..f9074a5 100644
--- a/disk_balance_test.py
+++ b/disk_balance_test.py
@@ -140,7 +140,7 @@ class TestDiskBalance(Tester):
         node.compact()
         mbean = make_mbean('db', type='BlacklistedDirectories')
         with JolokiaAgent(node) as jmx:
-            jmx.execute_method(mbean, 'markUnwritable', [os.path.join(node.get_path(), 'data0')])
+            jmx.execute_method(mbean, 'markUnwritable', [os.path.join(node.get_path(), 'data1')])
 
         for k in range(0, 10000):
             query_c1c2(session, k)
diff --git a/snapshot_test.py b/snapshot_test.py
index 7328c18..6da49da 100644
--- a/snapshot_test.py
+++ b/snapshot_test.py
@@ -206,7 +206,10 @@ class TestArchiveCommitlog(SnapshotTester):
         node.nodetool(snapshot_cmd)
         tmpdirs = []
         base_tmpdir = safe_mkdtemp()
-        for x in range(0, self.cluster.data_dir_count):
+        data_dir_count = self.cluster.data_dir_count
+        if self.cluster.version() >= '4.0' and ks in ['system', 'system_schema']:
+            data_dir_count = 1
+        for x in range(0, data_dir_count):
             tmpdir = os.path.join(base_tmpdir, str(x))
             os.mkdir(tmpdir)
             # Copy files from the snapshot dir to existing temp dir


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