From 82477e20ac90f28b835e9ddac9b04f067dfae27c Mon Sep 17 00:00:00 2001 From: Tyler Hobbs Date: Tue, 24 Jun 2014 17:03:46 -0500 Subject: [PATCH] Don't set min/max/core requests/conns if using v3 protocol --- tests/integration/standard/test_cluster.py | 2 ++ tests/integration/standard/test_concurrent.py | 3 ++- tests/integration/standard/test_query.py | 6 ++++-- tests/integration/standard/test_query_paging.py | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/integration/standard/test_cluster.py b/tests/integration/standard/test_cluster.py index 28ef0009..1c485f41 100644 --- a/tests/integration/standard/test_cluster.py +++ b/tests/integration/standard/test_cluster.py @@ -151,6 +151,8 @@ class ClusterTests(unittest.TestCase): """ 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) diff --git a/tests/integration/standard/test_concurrent.py b/tests/integration/standard/test_concurrent.py index ab533b13..35804db1 100644 --- a/tests/integration/standard/test_concurrent.py +++ b/tests/integration/standard/test_concurrent.py @@ -33,7 +33,8 @@ class ClusterTests(unittest.TestCase): def setUp(self): 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.row_factory = tuple_factory diff --git a/tests/integration/standard/test_query.py b/tests/integration/standard/test_query.py index dac0ef3a..b8dfa7bd 100644 --- a/tests/integration/standard/test_query.py +++ b/tests/integration/standard/test_query.py @@ -223,7 +223,8 @@ class BatchStatementTests(unittest.TestCase): % (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.execute("TRUNCATE test3rf.test") @@ -318,7 +319,8 @@ class SerialConsistencyTests(unittest.TestCase): % (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() def test_conditional_update(self): diff --git a/tests/integration/standard/test_query_paging.py b/tests/integration/standard/test_query_paging.py index 0e087e8a..3dce069c 100644 --- a/tests/integration/standard/test_query_paging.py +++ b/tests/integration/standard/test_query_paging.py @@ -41,7 +41,8 @@ class QueryPagingTests(unittest.TestCase): % (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.execute("TRUNCATE test3rf.test")