[cassandra-dtest] branch trunk updated: Fix test_pending_range

[br...@apache.org]

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

brandonwilliams 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 f5cb554  Fix test_pending_range
f5cb554 is described below

commit f5cb55464bf831e3a6d07bcf80facc2afebefc05
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Thu Oct 22 18:23:38 2020 -0400

    Fix test_pending_range
    
    Patch by Ekaterina Dimitrova, reviewed by Berenguer Blasi and
    brandonwilliams for CASSANDRA-16220
---
 pending_range_test.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pending_range_test.py b/pending_range_test.py
index 65c5f80..6371312 100644
--- a/pending_range_test.py
+++ b/pending_range_test.py
@@ -1,10 +1,10 @@
 import logging
 import pytest
+import re
 
 from cassandra.query import SimpleStatement
 
 from dtest import Tester, create_ks
-from plugins.assert_tools import assert_regexp_matches
 
 logger = logging.getLogger(__name__)
 
@@ -54,7 +54,10 @@ class TestPendingRangeMovements(Tester):
         node1.watch_log_for('Sleeping 30000 ms before start streaming/fetching ranges', timeout=10, from_mark=mark)
 
         if cluster.version() >= '2.2':
-            node2.watch_log_for('127.0.0.1 state moving', timeout=10, filename='debug.log')
+            if cluster.version() >= '4.0':
+                node2.watch_log_for('127.0.0.1:7000 state MOVING', timeout=10, filename='debug.log')
+            else:
+                node2.watch_log_for('127.0.0.1 state moving', timeout=10, filename='debug.log')
         else:
             # 2.1 doesn't have debug.log, so we are logging at trace, and look
             # in the system.log file
@@ -66,7 +69,7 @@ class TestPendingRangeMovements(Tester):
         # Verify other nodes believe this is Down/Moving
         out, _, _ = node2.nodetool('ring')
         logger.debug("Nodetool Ring output: {}".format(out))
-        assert_regexp_matches(out, '127\.0\.0\.1.*?Down.*?Moving')
+        assert re.search('127\.0\.0\.1.*?Down.*?Moving', out) is not None
 
         # Check we can still execute LWT
         for i in range(1000):


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