Add python 3.11 support

Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18121

Author: driftx

client_request_metrics_local_remote_test.py

@@ -9,7 +9,7 @@
 class TestClientRequestMetricsLocalRemote(Tester):
 
     def test_write_and_read(self):
-        session, node = setup(self)
+        session, node = setup_test(self)
 
         read_metrics = ClientRequestMetricsContainer(node, 'Read')
         write_metrics = ClientRequestMetricsContainer(node, 'Write')
@@ -47,7 +47,7 @@ def test_write_and_read(self):
         assert 0 < (r3_r.remote_requests - r2_r.remote_requests)
 
     def test_batch_and_slice(self):
-        session, node = setup(self)
+        session, node = setup_test(self)
 
         read_metrics = ClientRequestMetricsContainer(node, 'Read')
         write_metrics = ClientRequestMetricsContainer(node, 'Write')
@@ -89,7 +89,7 @@ def test_batch_and_slice(self):
         assert 0 < (r3_r.remote_requests - r2_r.remote_requests)
 
     def test_paxos(self):
-        session, node = setup(self)
+        session, node = setup_test(self)
 
         read_metrics = ClientRequestMetricsContainer(node, 'Read')
         write_metrics = ClientRequestMetricsContainer(node, 'Write')
@@ -177,7 +177,7 @@ def setup_schema(session):
     session.execute("CREATE TABLE test (id int,ord int,val varchar,PRIMARY KEY (id, ord));""")
 
 
-def setup(obj):
+def setup_test(obj):
     cluster = obj.cluster
     cluster.populate(2)
 

conftest.py

@@ -1,5 +1,8 @@
 import copy
-import collections
+try:
+    import collections.abc as collections
+except ImportError:
+    import collections
 import logging
 import os
 import platform
@@ -149,7 +152,7 @@ class level seems to work, and I guess it's not that much extra overhead to setu
     log_level = logging.INFO
     try:
         # first see if logging level overridden by user as command line argument
-        log_level_from_option = pytest.config.getoption("--log-level")
+        log_level_from_option = request.config.getoption("--log-level")
         if log_level_from_option is not None:
             log_level = logging.getLevelName(log_level_from_option)
         else:
@@ -158,22 +161,22 @@ class level seems to work, and I guess it's not that much extra overhead to setu
         # nope, user didn't specify it as a command line argument to pytest, check if
         # we have a default in the loaded pytest.ini. Note: words are seperated in variables
         # in .ini land with a "_" while the command line arguments use "-"
-        if pytest.config.inicfg.get("log_level") is not None:
-            log_level = logging.getLevelName(pytest.config.inicfg.get("log_level"))
+        if request.config.inicfg.get("log_level") is not None:
+            log_level = logging.getLevelName(request.config.inicfg.get("log_level"))
 
     logging.root.setLevel(log_level)
 
     logging_format = None
     try:
         # first see if logging level overridden by user as command line argument
-        log_format_from_option = pytest.config.getoption("--log-format")
+        log_format_from_option = request.config.getoption("--log-format")
         if log_format_from_option is not None:
             logging_format = log_format_from_option
         else:
             raise ValueError
     except ValueError:
-        if pytest.config.inicfg.get("log_format") is not None:
-            logging_format = pytest.config.inicfg.get("log_format")
+        if request.config.inicfg.get("log_format") is not None:
+            logging_format = request.config.inicfg.get("log_format")
 
     logging.basicConfig(level=log_level,
                         format=logging_format)
@@ -192,8 +195,8 @@ class level seems to work, and I guess it's not that much extra overhead to setu
 
 @pytest.fixture(scope="session")
 def log_global_env_facts(fixture_dtest_config, fixture_logging_setup):
-    if pytest.config.pluginmanager.hasplugin('junitxml'):
-        my_junit = getattr(pytest.config, '_xml', None)
+    if fixture_dtest_config.config.pluginmanager.hasplugin('junitxml'):
+        my_junit = getattr(fixture_dtest_config.config, '_xml', None)
         my_junit.add_global_property('USE_VNODES', fixture_dtest_config.use_vnodes)
 
 

consistency_test.py

@@ -556,7 +556,7 @@ def run():
         logger.debug("Waiting for workers to complete")
         while exceptions_queue.empty():
             time.sleep(0.1)
-            if len([t for t in threads if t.isAlive()]) == 0:
+            if len([t for t in threads if t.is_alive()]) == 0:
                 break
 
         if not exceptions_queue.empty():

jmx_test.py

@@ -42,7 +42,7 @@ def test_netstats(self):
         node1.flush()
         node1.stop(gently=False)
 
-        with pytest.raises(ToolError, message=r"ConnectException: 'Connection refused( \(Connection refused\))?'."):
+        with pytest.raises(ToolError, match=r"ConnectException: 'Connection refused( \(Connection refused\))?'."):
             node1.nodetool('netstats')
 
         # don't wait; we're testing for when nodetool is called on a node mid-startup

pytest.ini

@@ -1,7 +1,20 @@
 [pytest]
+addopts = --show-capture=stdout
 python_files = test_*.py *_test.py *_tests.py
 junit_suite_name = Cassandra dtests
-log_print = True
 log_level = INFO
 log_format = %(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s
 timeout = 900
+markers =
+    since
+    vnodes
+    no_vnodes
+    resource_intensive
+    offheap_memtables
+    no_offheap_memtables
+    ported_to_in_jvm
+    env
+    skip_version
+    upgrade_test
+    depends_cqlshlib
+    depends_driver

rebuild_test.py

@@ -217,17 +217,17 @@ def test_resumable_rebuild(self):
         node3.byteman_submit(script)
 
         # First rebuild must fail and data must be incomplete
-        with pytest.raises(ToolError, message='Unexpected: SUCCEED'):
+        with pytest.raises(ToolError):
             logger.debug('Executing first rebuild -> '),
             node3.nodetool('rebuild dc1')
-        logger.debug('Expected: FAILED')
+            pytest.fail("Expected: FAILED")
 
         session.execute('USE ks')
-        with pytest.raises(AssertionError, message='Unexpected: COMPLETE'):
+        with pytest.raises(AssertionError):
             logger.debug('Checking data is complete -> '),
             for i in range(0, 20000):
                 query_c1c2(session, i, ConsistencyLevel.LOCAL_ONE)
-        logger.debug('Expected: INCOMPLETE')
+            pytest.fail('Expected: INCOMPLETE')
 
         logger.debug('Executing second rebuild -> '),
         node3.nodetool('rebuild dc1')
@@ -336,8 +336,9 @@ def test_disallow_rebuild_nonlocal_range(self):
         session = self.patient_exclusive_cql_connection(node1)
         session.execute("CREATE KEYSPACE ks1 WITH replication = {'class':'SimpleStrategy', 'replication_factor':2};")
 
-        with pytest.raises(ToolError, match='is not a range that is owned by this node'):
+        with pytest.raises(ToolError):
             node1.nodetool('rebuild -ks ks1 -ts (%s,%s]' % (node1_token, node2_token))
+            pytest.fail("range should not be owned by this node")
 
     @since('3.10')
     @pytest.mark.no_vnodes
@@ -372,8 +373,9 @@ def test_disallow_rebuild_from_nonreplica(self):
         session = self.patient_exclusive_cql_connection(node1)
         session.execute("CREATE KEYSPACE ks1 WITH replication = {'class':'SimpleStrategy', 'replication_factor':2};")
 
-        with pytest.raises(ToolError, message='Unable to find sufficient sources for streaming range'):
+        with pytest.raises(ToolError):
             node1.nodetool('rebuild -ks ks1 -ts (%s,%s] -s %s' % (node3_token, node1_token, node3_address))
+            pytest.fail("should not find sufficient sources")
 
     @since('3.10')
     @pytest.mark.no_vnodes

requirements.txt

@@ -15,7 +15,7 @@ docopt
 enum34
 flaky
 mock
-pytest==3.6.4
+pytest>=6.5.0
 pytest-timeout==1.4.2
 pytest-repeat
 parse

tools/misc.py

@@ -5,7 +5,10 @@
 import logging
 import pytest
 
-from collections import Mapping
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
 
 from ccmlib.node import Node