tests: clean up review fixtures

Author: dkropachev

tests/unit/io/test_twistedreactor.py

@@ -147,10 +147,7 @@ def test_clean_close_error(self):
     def test_factory_returns_connection_done_before_startup(self):
         class StartupConnectionDone(TwistedConnection):
             def __init__(self, *args, **kwargs):
-                Connection.__init__(self, *args, **kwargs)
-                self.is_closed = False
-                self.connector = None
-                self.transport = None
+                super().__init__(*args, **kwargs)
                 self.defunct(ConnectionDone())
 
         conn = StartupConnectionDone.factory(
@@ -163,10 +160,7 @@ def __init__(self, *args, **kwargs):
     def test_factory_raises_connection_done_after_ready(self):
         class ReadyThenConnectionDone(TwistedConnection):
             def __init__(self, *args, **kwargs):
-                Connection.__init__(self, *args, **kwargs)
-                self.is_closed = False
-                self.connector = None
-                self.transport = None
+                super().__init__(*args, **kwargs)
                 self._compressor = None
                 self._handle_startup_response(ReadyMessage())
                 self.defunct(ConnectionDone())

tests/unit/test_cluster.py

@@ -2365,17 +2365,14 @@ class PoolSetupCancelled(BaseException):
     def test_connection_failure_preserves_legacy_on_down_override(self):
         class LegacyCluster(Cluster):
 
-            def __init__(self):
-                pass
-
             def on_down(self, host, is_host_addition,
                         expect_host_to_be_down=False):
                 self.down_call = (
                     host, is_host_addition, expect_host_to_be_down)
 
         host = Mock()
         host.signal_connection_failure.return_value = True
-        cluster = LegacyCluster()
+        cluster = object.__new__(LegacyCluster)
 
         cluster.signal_connection_failure(
             host,
@@ -2583,20 +2580,6 @@ def _on_down_locked(
     def test_pool_failure_preserves_legacy_cluster_on_down_override(self):
         class LegacyCluster(Cluster):
 
-            def __init__(self):
-                self._lock = RLock()
-                self.is_shutdown = False
-                self.allow_control_connection_query_fallback = (
-                    ControlConnectionQueryFallback.Disabled)
-                self.connect_timeout = 1
-                self.profile_manager = Mock()
-                self.profile_manager.distance.return_value = (
-                    HostDistance.LOCAL)
-                self.down_calls = []
-                self.sessions = []
-                self._discount_down_events = False
-                self.on_down_potentially_blocking = Mock()
-
             def on_down(
                     self, host, is_host_addition,
                     expect_host_to_be_down=False):
@@ -2606,8 +2589,19 @@ def on_down(
                     expect_host_to_be_down))
 
         session = self._new_session()
-        session.cluster = LegacyCluster()
+        session.cluster = object.__new__(LegacyCluster)
+        session.cluster._lock = RLock()
+        session.cluster.is_shutdown = False
+        session.cluster.allow_control_connection_query_fallback = (
+            ControlConnectionQueryFallback.Disabled)
+        session.cluster.connect_timeout = 1
+        session.cluster.profile_manager = Mock()
+        session.cluster.profile_manager.distance.return_value = (
+            HostDistance.LOCAL)
+        session.cluster.down_calls = []
         session.cluster.sessions = [session]
+        session.cluster._discount_down_events = False
+        session.cluster.on_down_potentially_blocking = Mock()
         session._profile_manager = session.cluster.profile_manager
         host = self._new_host()
         tasks = self._capture_submissions(session)

tests/unit/test_control_connection.py

@@ -452,11 +452,6 @@ def signal_error():
     def test_control_error_preserves_legacy_cluster_on_down_override(self):
         class LegacyCluster(Cluster):
 
-            def __init__(self):
-                self._lock = RLock()
-                self.metadata = MockMetadata()
-                self.down_calls = []
-
             def on_down(
                     self, host, is_host_addition,
                     expect_host_to_be_down=False):
@@ -465,7 +460,10 @@ def on_down(
                     is_host_addition,
                     expect_host_to_be_down))
 
-        cluster = LegacyCluster()
+        cluster = object.__new__(LegacyCluster)
+        cluster._lock = RLock()
+        cluster.metadata = MockMetadata()
+        cluster.down_calls = []
         control_connection = ControlConnection(cluster, 1, 0, 0, 0)
         host = cluster.metadata.get_host(DefaultEndPoint("192.168.1.0"))
         connection = Mock(

tests/unit/test_response_future.py

@@ -28,7 +28,7 @@
                                 ExecuteMessage,
                                 OverloadedErrorMessage, IsBootstrappingErrorMessage,
                                 PreparedQueryNotFound, PrepareMessage,
-                                ExecuteMessage, BatchMessage, ServerError,
+                                BatchMessage, ServerError,
                                 RESULT_KIND_ROWS, RESULT_KIND_SET_KEYSPACE,
                                 RESULT_KIND_SCHEMA_CHANGE, RESULT_KIND_PREPARED,
                                 ProtocolHandler)