Adding a skip where needed, fixing issue with cross test pollution in cqlengine

This commit is contained in:
GregBestland
2015-11-03 18:32:43 -06:00
parent c6f59c1e75
commit ca959de212
4 changed files with 24 additions and 20 deletions

View File

@@ -20,6 +20,7 @@ from cassandra.cqlengine import connection
from cassandra.cqlengine.management import create_keyspace_simple, CQLENG_ALLOW_SCHEMA_MANAGEMENT
from tests.integration import get_server_versions, use_single_node, PROTOCOL_VERSION
DEFAULT_KEYSPACE = 'cqlengine_test'
def setup_package():
@@ -28,16 +29,17 @@ def setup_package():
use_single_node()
keyspace = 'cqlengine_test'
connection.setup(['127.0.0.1'],
consistency=ConsistencyLevel.ONE,
protocol_version=PROTOCOL_VERSION,
default_keyspace=keyspace)
create_keyspace_simple(keyspace, 1)
setup_connection(DEFAULT_KEYSPACE)
create_keyspace_simple(DEFAULT_KEYSPACE, 1)
def is_prepend_reversed():
# do we have https://issues.apache.org/jira/browse/CASSANDRA-8733 ?
ver, _ = get_server_versions()
return not (ver >= (2, 0, 13) or ver >= (2, 1, 3))
def setup_connection(keyspace_name):
connection.setup(['127.0.0.1'],
consistency=ConsistencyLevel.ONE,
protocol_version=PROTOCOL_VERSION,
default_keyspace=keyspace_name)

View File

@@ -24,6 +24,7 @@ from cassandra.cqlengine.query import ResultObject
from cassandra.concurrent import execute_concurrent_with_args
from cassandra.cqlengine import models
from tests.integration.cqlengine import setup_connection
from tests.integration.cqlengine.base import BaseCassEngTestCase
from tests.integration.cqlengine.query.test_queryset import BaseQuerySetUsage
@@ -280,6 +281,7 @@ class TestNamedWithMV(BasicSharedKeyspaceUnitTestCase):
def tearDown(self):
models.DEFAULT_KEYSPACE = self.default_keyspace
setup_connection(models.DEFAULT_KEYSPACE)
def test_named_table_with_mv(self):
"""

View File

@@ -97,7 +97,6 @@ class TestConsistency(BaseConsistencyTest):
args = m.call_args
self.assertEqual(CL.ALL, args[0][0].consistency_level)
def test_delete(self):
# ensures we always carry consistency through on delete statements
t = TestConsistencyModel.create(text="bacon and eggs")

View File

@@ -88,6 +88,7 @@ class CythonProtocolHandlerTest(unittest.TestCase):
self.assertFalse(result.has_more_pages)
self._verify_numpy_page(result[0])
@notprotocolv1
@numpytest
def test_numpy_results_paged(self):
"""