openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Don't set min/max/core requests/conns if using v3 protocol

Browse Source
This commit is contained in:
Tyler Hobbs
2014-06-24 17:03:46 -05:00
parent 496674d04c
commit 82477e20ac
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/standard/test_cluster.py
View File

@@ -151,6 +151,8 @@ class ClusterTests(unittest.TestCase):
""" """
Test connection setting getters and setters Test connection setting getters and setters
""" """
if PROTOCOL_VERSION >= 3:
raise unittest.SkipTest("min/max requests and core/max conns aren't used with v3 protocol")
cluster = Cluster(protocol_version=PROTOCOL_VERSION) cluster = Cluster(protocol_version=PROTOCOL_VERSION)

3
tests/integration/standard/test_concurrent.py
View File

@@ -33,7 +33,8 @@ class ClusterTests(unittest.TestCase):
def setUp(self): def setUp(self):
self.cluster = Cluster(protocol_version=PROTOCOL_VERSION) self.cluster = Cluster(protocol_version=PROTOCOL_VERSION)
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1) if PROTOCOL_VERSION < 3:
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1)
self.session = self.cluster.connect() self.session = self.cluster.connect()
self.session.row_factory = tuple_factory self.session.row_factory = tuple_factory

6
tests/integration/standard/test_query.py
View File

@@ -223,7 +223,8 @@ class BatchStatementTests(unittest.TestCase):
% (PROTOCOL_VERSION,)) % (PROTOCOL_VERSION,))
self.cluster = Cluster(protocol_version=PROTOCOL_VERSION) self.cluster = Cluster(protocol_version=PROTOCOL_VERSION)
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1) if PROTOCOL_VERSION < 3:
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1)
self.session = self.cluster.connect() self.session = self.cluster.connect()
self.session.execute("TRUNCATE test3rf.test") self.session.execute("TRUNCATE test3rf.test")
@@ -318,7 +319,8 @@ class SerialConsistencyTests(unittest.TestCase):
% (PROTOCOL_VERSION,)) % (PROTOCOL_VERSION,))
self.cluster = Cluster(protocol_version=PROTOCOL_VERSION) self.cluster = Cluster(protocol_version=PROTOCOL_VERSION)
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1) if PROTOCOL_VERSION < 3:
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1)
self.session = self.cluster.connect() self.session = self.cluster.connect()
def test_conditional_update(self): def test_conditional_update(self):

3
tests/integration/standard/test_query_paging.py
View File

@@ -41,7 +41,8 @@ class QueryPagingTests(unittest.TestCase):
% (PROTOCOL_VERSION,)) % (PROTOCOL_VERSION,))
self.cluster = Cluster(protocol_version=PROTOCOL_VERSION) self.cluster = Cluster(protocol_version=PROTOCOL_VERSION)
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1) if PROTOCOL_VERSION < 3:
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1)
self.session = self.cluster.connect() self.session = self.cluster.connect()
self.session.execute("TRUNCATE test3rf.test") self.session.execute("TRUNCATE test3rf.test")