Fixing a few broken integration tests

This commit is contained in:
GregBestland
2015-10-20 14:44:50 -05:00
parent 32407d7a1f
commit 2ade38b5b9
2 changed files with 5 additions and 2 deletions

View File

@@ -16,7 +16,7 @@ import struct, time, logging, sys, traceback
from cassandra import ConsistencyLevel, Unavailable, OperationTimedOut, ReadTimeout, ReadFailure, \ from cassandra import ConsistencyLevel, Unavailable, OperationTimedOut, ReadTimeout, ReadFailure, \
WriteTimeout, WriteFailure WriteTimeout, WriteFailure
from cassandra.cluster import Cluster, NoHostAvailable from cassandra.cluster import Cluster, NoHostAvailable, Session
from cassandra.concurrent import execute_concurrent_with_args from cassandra.concurrent import execute_concurrent_with_args
from cassandra.metadata import murmur3 from cassandra.metadata import murmur3
from cassandra.policies import (RoundRobinPolicy, DCAwareRoundRobinPolicy, from cassandra.policies import (RoundRobinPolicy, DCAwareRoundRobinPolicy,
@@ -426,7 +426,7 @@ class LoadBalancingPolicyTests(unittest.TestCase):
self._query(session, keyspace, use_prepared=use_prepared) self._query(session, keyspace, use_prepared=use_prepared)
self.fail() self.fail()
except Unavailable as e: except Unavailable as e:
self.assertEqual(e.consistency, 1) self.assertEqual(e.consistency, Session.default_consistency_level)
self.assertEqual(e.required_replicas, 1) self.assertEqual(e.required_replicas, 1)
self.assertEqual(e.alive_replicas, 0) self.assertEqual(e.alive_replicas, 0)

View File

@@ -693,6 +693,9 @@ class SchemaMetadataTests(BasicSegregatedKeyspaceUnitTestCase):
@test_category metadata @test_category metadata
""" """
if CASS_SERVER_VERSION < (3, 0):
raise unittest.SkipTest("Materialized views require Cassandra 3.0+")
self.session.execute("CREATE TABLE {0}.{1} (a int PRIMARY KEY, b map<text, int>)".format(self.keyspace_name, self.function_table_name)) self.session.execute("CREATE TABLE {0}.{1} (a int PRIMARY KEY, b map<text, int>)".format(self.keyspace_name, self.function_table_name))
self.session.execute("CREATE INDEX index_1 ON {0}.{1}(b)".format(self.keyspace_name, self.function_table_name)) self.session.execute("CREATE INDEX index_1 ON {0}.{1}(b)".format(self.keyspace_name, self.function_table_name))
self.session.execute("CREATE INDEX index_2 ON {0}.{1}(keys(b))".format(self.keyspace_name, self.function_table_name)) self.session.execute("CREATE INDEX index_2 ON {0}.{1}(keys(b))".format(self.keyspace_name, self.function_table_name))