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

Make cqlengine tests invoke ccm.

Browse Source
This commit is contained in:
Adam Holmberg
2015-02-04 16:49:40 -06:00
parent 426664d3e1
commit 3171119cc1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integration/__init__.py
View File

@@ -156,14 +156,15 @@ def is_current_cluster(cluster_name, node_counts):
def use_cluster(cluster_name, nodes, ipformat=None, start=True):
global CCM_CLUSTER
if USE_CCM_CASS_EXTERNAL:
log.debug("Using external cluster %s", CCM_CLUSTER.name)
return
if is_current_cluster(cluster_name, nodes):
log.debug("Using existing cluster %s", cluster_name)
return
global CCM_CLUSTER
if CCM_CLUSTER:
log.debug("Stopping cluster %s", CCM_CLUSTER.name)
CCM_CLUSTER.stop()

4
tests/integration/cqlengine/__init__.py
View File

@@ -1,10 +1,12 @@
from cassandra.cqlengine import connection
from cassandra.cqlengine.management import create_keyspace
from tests.integration import PROTOCOL_VERSION
from tests.integration import use_single_node, PROTOCOL_VERSION
def setup_package():
use_single_node()
keyspace = 'cqlengine_test'
connection.setup(['localhost'],
protocol_version=PROTOCOL_VERSION,