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

Check CASSANDRA_HOME as well during testing

Browse Source
This commit is contained in:
Joaquin Casares
2014-07-16 13:06:29 -05:00
parent 4bf5a41595
commit d67699db26
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integration/__init__.py
View File

@@ -40,6 +40,7 @@ MULTIDC_CLUSTER_NAME = 'multidc_test_cluster'
CCM_CLUSTER = None CCM_CLUSTER = None
CASSANDRA_DIR = os.getenv('CASSANDRA_DIR', None) CASSANDRA_DIR = os.getenv('CASSANDRA_DIR', None)
CASSANDRA_HOME = os.getenv('CASSANDRA_HOME', None)
CASSANDRA_VERSION = os.getenv('CASSANDRA_VERSION', '2.0.9') CASSANDRA_VERSION = os.getenv('CASSANDRA_VERSION', '2.0.9')
if CASSANDRA_VERSION.startswith('1'): if CASSANDRA_VERSION.startswith('1'):
@@ -97,6 +98,8 @@ def get_node(node_id):
def setup_package(): def setup_package():
if CASSANDRA_DIR: if CASSANDRA_DIR:
log.info("Using Cassandra dir: %s", CASSANDRA_DIR) log.info("Using Cassandra dir: %s", CASSANDRA_DIR)
elif CASSANDRA_HOME:
log.info("Using Cassandra home: %s", CASSANDRA_HOME)
else: else:
log.info('Using Cassandra version: %s', CASSANDRA_VERSION) log.info('Using Cassandra version: %s', CASSANDRA_VERSION)
try: try: