Merge pull request #363 from dkropachev/int_tests_on_3.13

Bring python 3.13 into integration tests

Author: dkropachev

.github/workflows/integration-tests.yml

@@ -17,26 +17,29 @@ jobs:
       fail-fast: false
       matrix:
         java-version: [8]
-        python-version: ["3.8.17", "3.11.4", "3.12.0b4"]
+        python-version: ["3.8", "3.11", "3.12", "3.13"]
         event_loop_manager: ["libev", "asyncio", "asyncore"]
         exclude:
-          - python-version: "3.12.0b4"
+          - python-version: "3.12"
+            event_loop_manager: "asyncore"
+          - python-version: "3.13"
             event_loop_manager: "asyncore"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK ${{ matrix.java-version }}
       uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java-version }}
         distribution: 'adopt'
 
-    - name: setup pyenv ${{ matrix.python-version }}
-      uses: "gabrielfalcao/pyenv-action@v16"
+    - uses: actions/setup-python@v5
+      name: Install Python ${{ matrix.python-version }}
       with:
-        default: 2.7.14
-        versions: ${{ matrix.python-version }}
+        python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
+
     - name: Test with pytest
       run: |
         export EVENT_LOOP_MANAGER=${{ matrix.event_loop_manager }}

tests/integration/cqlengine/management/test_management.py

@@ -254,7 +254,7 @@ def test_table_property_update(self):
 
         table_options = management._get_table_metadata(ModelWithTableProperties).options
 
-        self.assertDictContainsSubset(ModelWithTableProperties.__options__, table_options)
+        self.assertTrue(set(ModelWithTableProperties.__options__) <= set(table_options))
 
     def test_bogus_option_update(self):
         sync_table(ModelWithTableProperties)

tests/integration/long/test_ipv6.py

@@ -16,19 +16,25 @@
 from ccmlib import common
 
 from cassandra.cluster import NoHostAvailable
-from cassandra.io.asyncorereactor import AsyncoreConnection
+
+try:
+    from cassandra.io.asyncorereactor import AsyncoreConnection
+except ImportError:
+    AsyncoreConnection = None
 
 from tests import is_monkey_patched
 from tests.integration import use_cluster, remove_cluster, TestCluster
 
+try:
+    from cassandra.io.libevreactor import LibevConnection
+except ImportError:
+    LibevConnection = None
+
+
 if is_monkey_patched():
-    LibevConnection = -1
-    AsyncoreConnection = -1
-else:
-    try:
-        from cassandra.io.libevreactor import LibevConnection
-    except ImportError:
-        LibevConnection = None
+    LibevConnection = None
+    AsyncoreConnection = None
+
 
 import unittest
 
@@ -102,7 +108,7 @@ def setUp(self):
         if os.name == "nt":
             raise unittest.SkipTest("IPv6 is currently not supported under Windows")
 
-        if LibevConnection == -1:
+        if LibevConnection is None:
             raise unittest.SkipTest("Can't test libev with monkey patching")
         elif LibevConnection is None:
             raise unittest.SkipTest("Libev does not appear to be installed properly")
@@ -116,5 +122,5 @@ def setUp(self):
         if os.name == "nt":
             raise unittest.SkipTest("IPv6 is currently not supported under Windows")
 
-        if AsyncoreConnection == -1:
+        if AsyncoreConnection is None:
             raise unittest.SkipTest("Can't test asyncore with monkey patching")

tests/integration/standard/test_connection.py

@@ -446,6 +446,9 @@ class AsyncoreConnectionTests(ConnectionTests, unittest.TestCase):
     def setUp(self):
         if is_monkey_patched():
             raise unittest.SkipTest("Can't test asyncore with monkey patching")
+        if AsyncoreConnection is None:
+            raise unittest.SkipTest(
+                'asyncore does not appear to be installed properly')
         ConnectionTests.setUp(self)
 
     def clean_global_loop(self):

tests/integration/standard/test_metadata.py

@@ -133,7 +133,7 @@ def test_bad_contact_point(self):
 
         # verify the un-existing host was filtered
         for host in self.cluster.metadata.all_hosts():
-            self.assertNotEquals(host.endpoint.address, '126.0.0.186')
+            self.assertNotEqual(host.endpoint.address, '126.0.0.186')
 
 
 class SchemaMetadataTests(BasicSegregatedKeyspaceUnitTestCase):