Skip to content

Commit 8d49ac0

Browse files
committed
fixed connection issue in tests
1 parent 1455b6b commit 8d49ac0

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

frontera/contrib/backends/cassandra/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def __init__(self, manager):
4242

4343
def frontier_stop(self):
4444
self.states.flush()
45+
connection.unregister_connection('default')
4546

4647
def _create_queue(self, settings):
4748
return Queue(self.models['QueueModel'], settings.get('SPIDER_FEED_PARTITIONS'))

tests/contrib/backends/cassandra/test_backend_cassandra.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,30 @@ class BaseCassandraTest(object):
3333

3434
def setUp(self):
3535
settings = Settings()
36-
hosts = ['127.0.0.1']
37-
port = 9042
36+
self.hosts = ['127.0.0.1']
37+
self.port = 9042
3838
self.manager = type('manager', (object,), {})
3939
self.manager.settings = settings
4040
self.keyspace = settings.CASSANDRABACKEND_KEYSPACE
41-
timeout = settings.CASSANDRABACKEND_REQUEST_TIMEOUT
42-
cluster = Cluster(hosts, port)
41+
self.timeout = settings.CASSANDRABACKEND_REQUEST_TIMEOUT
42+
cluster = Cluster(self.hosts, self.port)
4343
self.session = cluster.connect()
44-
if not connection.cluster:
45-
connection.setup(hosts, self.keyspace, port=port)
46-
connection.session.default_timeout = timeout
44+
self._set_global_connection(self.hosts, self.port, self.timeout)
4745
create_keyspace_simple(self.keyspace, 1)
4846
self.session.set_keyspace(self.keyspace)
49-
self.session.default_timeout = timeout
47+
self.session.default_timeout = self.timeout
5048
connection.session.set_keyspace(self.keyspace)
5149

5250
def tearDown(self):
51+
self._set_global_connection(self.hosts, self.port, self.timeout)
5352
drop_keyspace(self.keyspace)
5453
self.session.shutdown()
54+
connection.unregister_connection('default')
55+
56+
def _set_global_connection(self, hosts, port, timeout):
57+
if not connection.cluster:
58+
connection.setup(hosts, self.keyspace, port=port)
59+
connection.session.default_timeout = timeout
5560

5661

5762
class TestCassandraBackendModels(BaseCassandraTest, unittest.TestCase):

0 commit comments

Comments
 (0)