From e337ef26c9633558d11e7e8063ef9c894e44a4fa Mon Sep 17 00:00:00 2001
From: bjmb <jaume.marhuenda@datastax.com>
Date: Tue, 23 May 2017 15:19:52 -0400
Subject: [PATCH] Moved test_watchers_are_finished to unit tests

---
 tests/integration/standard/test_connection.py | 42 ------------------
 tests/unit/io/test_libevreactor.py            | 43 ++++++++++++++++---
 2 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/tests/integration/standard/test_connection.py b/tests/integration/standard/test_connection.py
index ffb31558..d1b676a3 100644
--- a/tests/integration/standard/test_connection.py
+++ b/tests/integration/standard/test_connection.py
@@ -37,7 +37,6 @@ from tests.integration import use_singledc, PROTOCOL_VERSION, get_node, CASSANDR
 
 try:
     from cassandra.io.libevreactor import LibevConnection
-    from cassandra.io.libevreactor import _cleanup as libev__cleanup
 except ImportError:
     LibevConnection = None
 
@@ -400,44 +399,3 @@ class LibevConnectionTests(ConnectionTests, unittest.TestCase):
             raise unittest.SkipTest(
                 'libev does not appear to be installed properly')
         ConnectionTests.setUp(self)
-
-    def test_watchers_are_finished(self):
-        """
-        Test for asserting that watchers are closed in LibevConnection
-
-        It will open a connection to the Cluster and then abruptly clean it simulating,
-        a process termination without calling cluster.shutdown(), which would trigger
-        LibevConnection._libevloop._cleanup. Then it will check the watchers have been closed
-        Finally it will restore the LibevConnection reactor so it doesn't affect
-        the rest of the tests
-
-        @since 3.10
-        @jira_ticket PYTHON-747
-        @expected_result the watchers are closed
-
-        @test_category connection
-        """
-
-        # conn._write_watcher and conn._read_watcher will be closed
-        # when the request is finished so it may not be _cleanup the
-        # one who ends up cleaning them everytime.
-        for _ in range(10):
-            cluster = Cluster(connection_class=LibevConnection)
-            session = cluster.connect(wait_for_all_pools=True)
-
-            session.execute_async("SELECT * FROM system.local LIMIT 1")
-            # We have to make a copy because the connections shouldn't
-            # be alive when we verify them
-            live_connections = set(LibevConnection._libevloop._live_conns)
-
-            # This simulates the process ending without cluster.shutdown()
-            # being called, then with atexit _cleanup for libevreactor would
-            # be called
-            libev__cleanup(weakref.ref(LibevConnection._libevloop))
-
-            for conn in live_connections:
-                for watcher in (conn._write_watcher, conn._read_watcher):
-                    self.assertTrue(watcher is None or not watcher.is_active())
-
-            cluster.shutdown()
-            LibevConnection._libevloop = None
diff --git a/tests/unit/io/test_libevreactor.py b/tests/unit/io/test_libevreactor.py
index 273dcc00..cb15f380 100644
--- a/tests/unit/io/test_libevreactor.py
+++ b/tests/unit/io/test_libevreactor.py
@@ -20,25 +20,24 @@ import errno
 import math
 from mock import patch, Mock
 import os
+import weakref
 import six
 from six import BytesIO
 from socket import error as socket_error
-import sys
-import time
 
+from cassandra.io.libevreactor import _cleanup as libev__cleanup
 from cassandra.connection import (HEADER_DIRECTION_TO_CLIENT,
                                   ConnectionException, ProtocolError)
 
 from cassandra.protocol import (write_stringmultimap, write_int, write_string,
                                 SupportedMessage, ReadyMessage, ServerError)
 from cassandra.marshal import uint8_pack, uint32_pack, int32_pack
-from tests.unit.io.utils import TimerCallback
-from tests.unit.io.utils import submit_and_wait_for_completion
+
 from tests import is_monkey_patched
 
 
 try:
-    from cassandra.io.libevreactor import LibevConnection
+    from cassandra.io.libevreactor import LibevConnection, LibevLoop
 except ImportError:
     LibevConnection = None  # noqa
 
@@ -296,3 +295,37 @@ class LibevConnectionTest(unittest.TestCase):
 
         self.assertTrue(c.connected_event.is_set())
         self.assertFalse(c.is_defunct)
+
+    def test_watchers_are_finished(self, *args):
+        """
+        Test for asserting that watchers are closed in LibevConnection
+
+        This test simulates a process termination without calling cluster.shutdown(), which would trigger
+        LibevConnection._libevloop._cleanup. It will check the watchers have been closed
+        Finally it will restore the LibevConnection reactor so it doesn't affect
+        the rest of the tests
+
+        @since 3.10
+        @jira_ticket PYTHON-747
+        @expected_result the watchers are closed
+
+        @test_category connection
+        """
+        with patch.object(LibevConnection._libevloop, "_thread"), \
+             patch.object(LibevConnection._libevloop, "notify"):
+
+            self.make_connection()
+
+            # We have to make a copy because the connections shouldn't
+            # be alive when we verify them
+            live_connections = set(LibevConnection._libevloop._live_conns)
+
+            # This simulates the process ending without cluster.shutdown()
+            # being called, then with atexit _cleanup for libevreactor would
+            # be called
+            libev__cleanup(weakref.ref(LibevConnection._libevloop))
+            for conn in live_connections:
+                for watcher in (conn._write_watcher, conn._read_watcher):
+                    self.assertTrue(watcher.stop.mock_calls)
+
+        LibevConnection._libevloop._shutdown = False