Fix compatibility tests

hazelcast/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "5.3.0"
+__version__ = "5.4.0"
 
 # Set the default handler to "hazelcast" loggers
 # to avoid "No handlers could be found" warnings.

tests/integration/backward_compatible/predicate_test.py

@@ -28,7 +28,7 @@
     write_string_to_writer,
     read_string_from_reader,
 )
-from tests.util import random_string, get_abs_path
+from tests.util import random_string, get_abs_path, skip_if_server_version_newer_than_or_equal
 from hazelcast import HazelcastClient
 
 
@@ -171,6 +171,8 @@ def test_false(self):
         self.assertCountEqual(self.map.key_set(predicate), [])
 
     def test_paging(self):
+        # https://github.com/hazelcast/hazelcast-python-client/issues/666
+        skip_if_server_version_newer_than_or_equal(self, self.client, "5.4")
         self.fill_map_numeric()
         predicate = paging(less("this", 4), 2)
         self.assertCountEqual([0, 1], self.map.key_set(predicate))
@@ -339,6 +341,8 @@ def setUpClass(cls):
         cls.map = cls.client.get_map(random_string()).blocking()
 
     def setUp(self):
+        # https://github.com/hazelcast/hazelcast-python-client/issues/666
+        skip_if_server_version_newer_than_or_equal(self, self.client, "5.4")
         self.map.clear()
 
     @classmethod

tests/integration/backward_compatible/proxy/reliable_topic_test.py

@@ -277,7 +277,8 @@ def on_cancel(self) -> None:
         # Should be cancelled since on_message raised error
         self.assertTrueEventually(lambda: self.assertEqual(0, len(topic._wrapped._runners)))
 
-        self.assertEqual(1, on_cancel_call_count.get())
+        if compare_client_version("5.4") >= 0:
+            self.assertEqual(1, on_cancel_call_count.get())
 
     def test_add_listener_when_on_message_and_is_terminal_raises_error(self):
         topic = self.get_topic(random_string())
@@ -319,7 +320,8 @@ def on_cancel(self) -> None:
         # Should be cancelled since on_message raised error
         self.assertTrueEventually(lambda: self.assertEqual(0, len(topic._wrapped._runners)))
 
-        self.assertEqual(1, on_cancel_call_count.get())
+        if compare_client_version("5.4") >= 0:
+            self.assertEqual(1, on_cancel_call_count.get())
 
     def test_add_listener_with_non_callable(self):
         topic = self.get_topic(random_string())
@@ -352,7 +354,8 @@ def on_cancel(self) -> None:
 
         registration_id = topic.add_listener(Listener())
         self.assertTrue(topic.remove_listener(registration_id))
-        self.assertEqual(1, on_cancel_call_count.get())
+        if compare_client_version("5.4") >= 0:
+            self.assertEqual(1, on_cancel_call_count.get())
 
     def test_remove_listener_does_not_receive_messages_after_removal(self):
         topic = self.get_topic(random_string())

tests/integration/backward_compatible/serialization/compact_compatibility/compact_compatibility_test.py

@@ -12,6 +12,7 @@
     compare_server_version_with_rc,
     skip_if_client_version_older_than,
     skip_if_server_version_older_than,
+    skip_if_server_version_newer_than_or_equal,
 )
 
 try:
@@ -672,6 +673,8 @@ def test_entry_set_with_predicate(self):
         )
 
     def test_entry_set_with_paging_predicate(self):
+        # https://github.com/hazelcast/hazelcast-python-client/issues/666
+        skip_if_server_version_newer_than_or_equal(self, self.client, "5.4")
         self._put_from_another_client(INNER_COMPACT_INSTANCE, OUTER_COMPACT_INSTANCE)
         self.assertEqual(
             [(INNER_COMPACT_INSTANCE, OUTER_COMPACT_INSTANCE)],
@@ -751,6 +754,8 @@ def test_key_set_with_predicate(self):
         )
 
     def test_key_set_with_paging_predicate(self):
+        # https://github.com/hazelcast/hazelcast-python-client/issues/666
+        skip_if_server_version_newer_than_or_equal(self, self.client, "5.4")
         self._put_from_another_client(OUTER_COMPACT_INSTANCE, INNER_COMPACT_INSTANCE)
         self.assertEqual(
             [OUTER_COMPACT_INSTANCE],
@@ -882,6 +887,8 @@ def test_values_with_predicate(self):
         self.assertEqual([OUTER_COMPACT_INSTANCE], self.map.values(CompactPredicate()))
 
     def test_values_with_paging_predicate(self):
+        # https://github.com/hazelcast/hazelcast-python-client/issues/666
+        skip_if_server_version_newer_than_or_equal(self, self.client, "5.4")
         self._put_from_another_client(INNER_COMPACT_INSTANCE, OUTER_COMPACT_INSTANCE)
         self.assertEqual([OUTER_COMPACT_INSTANCE], self.map.values(paging(CompactPredicate(), 1)))