Skip to content

Commit 14b8108

Browse files
committed
use klass, not AsyncoreConnection
1 parent 43e85ac commit 14b8108

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

tests/integration/standard/test_connection.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def wait_for_no_connections(self, host, cluster):
191191

192192
class ConnectionTests(object):
193193

194-
klass = None
194+
klass, global_loop = None, False
195195

196196
def setUp(self):
197197
self.klass.initialize_reactor()
@@ -394,10 +394,13 @@ def test_connect_timeout(self):
394394
self.assertTrue(exception_thrown)
395395

396396
def test_subclasses_share_loop(self):
397-
class C1(AsyncoreConnection):
397+
if not self.global_loop:
398+
raise unittest.case.SkipTest
399+
400+
class C1(self.klass):
398401
pass
399402

400-
class C2(AsyncoreConnection):
403+
class C2(self.klass):
401404
pass
402405

403406
clusterC1 = Cluster(connection_class=C1)
@@ -412,16 +415,16 @@ class C2(AsyncoreConnection):
412415

413416

414417
def get_eventloop_threads(name):
415-
import threading
416418
event_loops_threads = [thread for thread in threading.enumerate() if name == thread.name]
417419

418420
return event_loops_threads
419421

420422

421423
class AsyncoreConnectionTests(ConnectionTests, unittest.TestCase):
422424

423-
klass = AsyncoreConnection
424-
event_loop_name = "cassandra_driver_event_loop"
425+
klass, global_loop, event_loop_name = (
426+
AsyncoreConnection, True, "cassandra_driver_event_loop"
427+
)
425428

426429
def setUp(self):
427430
if is_monkey_patched():
@@ -435,8 +438,9 @@ def clean_global_loop(self):
435438

436439
class LibevConnectionTests(ConnectionTests, unittest.TestCase):
437440

438-
klass = LibevConnection
439-
event_loop_name = "event_loop"
441+
klass, global_loop, event_loop_name = (
442+
LibevConnection, True, "event_loop"
443+
)
440444

441445
def setUp(self):
442446
if is_monkey_patched():

0 commit comments

Comments
 (0)