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

Fixing various unstable tests

Browse Source
This commit is contained in:
GregBestland
2016-09-14 14:15:06 -05:00
parent f89df3f15f
commit 4fba5514ab
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integration/__init__.py
View File

@@ -218,6 +218,7 @@ greaterthanorequalcass36 = unittest.skipUnless(CASSANDRA_VERSION >= '3.6', 'Cass
lessthancass30 = unittest.skipUnless(CASSANDRA_VERSION < '3.0', 'Cassandra version less then 3.0 required') lessthancass30 = unittest.skipUnless(CASSANDRA_VERSION < '3.0', 'Cassandra version less then 3.0 required')
dseonly = unittest.skipUnless(DSE_VERSION, "Test is only applicalbe to DSE clusters") dseonly = unittest.skipUnless(DSE_VERSION, "Test is only applicalbe to DSE clusters")
pypy = unittest.skipUnless(platform.python_implementation() == "PyPy", "Test is skipped unless it's on PyPy") pypy = unittest.skipUnless(platform.python_implementation() == "PyPy", "Test is skipped unless it's on PyPy")
notpy3 = unittest.skipIf(sys.version_info >= (3, 0), "Test not applicable for Python 3.x runtime")
def wait_for_node_socket(node, timeout): def wait_for_node_socket(node, timeout):
@@ -546,7 +547,7 @@ class BasicKeyspaceUnitTestCase(unittest.TestCase):
@classmethod @classmethod
def common_setup(cls, rf, keyspace_creation=True, create_class_table=False, metrics=False): def common_setup(cls, rf, keyspace_creation=True, create_class_table=False, metrics=False):
cls.cluster = Cluster(protocol_version=PROTOCOL_VERSION, metrics_enabled=metrics) cls.cluster = Cluster(protocol_version=PROTOCOL_VERSION, metrics_enabled=metrics)
cls.session = cls.cluster.connect() cls.session = cls.cluster.connect(wait_for_all_pools=True)
cls.ks_name = cls.__name__.lower() cls.ks_name = cls.__name__.lower()
if keyspace_creation: if keyspace_creation:
cls.create_keyspace(rf) cls.create_keyspace(rf)

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

@@ -162,7 +162,7 @@ class HeartbeatTest(unittest.TestCase):
def wait_for_no_connections(self, host, cluster): def wait_for_no_connections(self, host, cluster):
retry = 0 retry = 0
while(retry < 100): while(retry < 200):
retry += 1 retry += 1
connections = self.fetch_connections(host, cluster) connections = self.fetch_connections(host, cluster)
if len(connections) is 0: if len(connections) is 0:

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

@@ -26,7 +26,7 @@ from cassandra.query import (PreparedStatement, BoundStatement, SimpleStatement,
from cassandra.cluster import Cluster, NoHostAvailable from cassandra.cluster import Cluster, NoHostAvailable
from cassandra.policies import HostDistance, RoundRobinPolicy from cassandra.policies import HostDistance, RoundRobinPolicy
from tests.unit.cython.utils import notcython from tests.unit.cython.utils import notcython
from tests.integration import use_singledc, PROTOCOL_VERSION, BasicSharedKeyspaceUnitTestCase, get_server_versions, greaterthanprotocolv3, MockLoggingHandler, get_supported_protocol_versions from tests.integration import use_singledc, PROTOCOL_VERSION, BasicSharedKeyspaceUnitTestCase, get_server_versions, greaterthanprotocolv3, MockLoggingHandler, get_supported_protocol_versions, notpy3
import time import time
import re import re
@@ -71,6 +71,7 @@ class QueryTests(BasicSharedKeyspaceUnitTestCase):
str(event) str(event)
@notcython @notcython
@notpy3
def test_row_error_message(self): def test_row_error_message(self):
""" """
Test to validate, new column deserialization message Test to validate, new column deserialization message
@@ -483,7 +484,7 @@ class BatchStatementTests(BasicSharedKeyspaceUnitTestCase):
self.cluster = Cluster(protocol_version=PROTOCOL_VERSION) self.cluster = Cluster(protocol_version=PROTOCOL_VERSION)
if PROTOCOL_VERSION < 3: if PROTOCOL_VERSION < 3:
self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1) self.cluster.set_core_connections_per_host(HostDistance.LOCAL, 1)
self.session = self.cluster.connect() self.session = self.cluster.connect(wait_for_all_pools=True)
def tearDown(self): def tearDown(self):
self.cluster.shutdown() self.cluster.shutdown()