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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

26
tests/integration/cqlengine/query/test_named.py
View File

@@ -24,6 +24,7 @@ from cassandra.cqlengine.query import ResultObject
from cassandra.concurrent import execute_concurrent_with_args from cassandra.concurrent import execute_concurrent_with_args
from cassandra.cqlengine import models from cassandra.cqlengine import models
from tests.integration.cqlengine import setup_connection
from tests.integration.cqlengine.base import BaseCassEngTestCase from tests.integration.cqlengine.base import BaseCassEngTestCase
from tests.integration.cqlengine.query.test_queryset import BaseQuerySetUsage from tests.integration.cqlengine.query.test_queryset import BaseQuerySetUsage
@@ -128,7 +129,7 @@ class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):
from tests.integration.cqlengine.query.test_queryset import TestModel from tests.integration.cqlengine.query.test_queryset import TestModel
ks,tn = TestModel.column_family_name().split('.') ks, tn = TestModel.column_family_name().split('.')
cls.keyspace = NamedKeyspace(ks) cls.keyspace = NamedKeyspace(ks)
cls.table = cls.keyspace.table(tn) cls.table = cls.keyspace.table(tn)
@@ -149,8 +150,8 @@ class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):
def test_iteration(self): def test_iteration(self):
""" Tests that iterating over a query set pulls back all of the expected results """ """ Tests that iterating over a query set pulls back all of the expected results """
q = self.table.objects(test_id=0) q = self.table.objects(test_id=0)
#tuple of expected attempt_id, expected_result values # tuple of expected attempt_id, expected_result values
compare_set = set([(0,5), (1,10), (2,15), (3,20)]) compare_set = set([(0, 5), (1, 10), (2, 15), (3, 20)])
for t in q: for t in q:
val = t.attempt_id, t.expected_result val = t.attempt_id, t.expected_result
assert val in compare_set assert val in compare_set
@@ -160,8 +161,8 @@ class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):
# test with regular filtering # test with regular filtering
q = self.table.objects(attempt_id=3).allow_filtering() q = self.table.objects(attempt_id=3).allow_filtering()
assert len(q) == 3 assert len(q) == 3
#tuple of expected test_id, expected_result values # tuple of expected test_id, expected_result values
compare_set = set([(0,20), (1,20), (2,75)]) compare_set = set([(0, 20), (1, 20), (2, 75)])
for t in q: for t in q:
val = t.test_id, t.expected_result val = t.test_id, t.expected_result
assert val in compare_set assert val in compare_set
@@ -171,8 +172,8 @@ class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):
# test with query method # test with query method
q = self.table.objects(self.table.column('attempt_id') == 3).allow_filtering() q = self.table.objects(self.table.column('attempt_id') == 3).allow_filtering()
assert len(q) == 3 assert len(q) == 3
#tuple of expected test_id, expected_result values # tuple of expected test_id, expected_result values
compare_set = set([(0,20), (1,20), (2,75)]) compare_set = set([(0, 20), (1, 20), (2, 75)])
for t in q: for t in q:
val = t.test_id, t.expected_result val = t.test_id, t.expected_result
assert val in compare_set assert val in compare_set
@@ -183,16 +184,16 @@ class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):
""" Tests that iterating over a query set more than once works """ """ Tests that iterating over a query set more than once works """
# test with both the filtering method and the query method # test with both the filtering method and the query method
for q in (self.table.objects(test_id=0), self.table.objects(self.table.column('test_id') == 0)): for q in (self.table.objects(test_id=0), self.table.objects(self.table.column('test_id') == 0)):
#tuple of expected attempt_id, expected_result values # tuple of expected attempt_id, expected_result values
compare_set = set([(0,5), (1,10), (2,15), (3,20)]) compare_set = set([(0, 5), (1, 10), (2, 15), (3, 20)])
for t in q: for t in q:
val = t.attempt_id, t.expected_result val = t.attempt_id, t.expected_result
assert val in compare_set assert val in compare_set
compare_set.remove(val) compare_set.remove(val)
assert len(compare_set) == 0 assert len(compare_set) == 0
#try it again # try it again
compare_set = set([(0,5), (1,10), (2,15), (3,20)]) compare_set = set([(0, 5), (1, 10), (2, 15), (3, 20)])
for t in q: for t in q:
val = t.attempt_id, t.expected_result val = t.attempt_id, t.expected_result
assert val in compare_set assert val in compare_set
@@ -205,7 +206,7 @@ class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):
""" """
for q in (self.table.objects(test_id=0), self.table.objects(self.table.column('test_id') == 0)): for q in (self.table.objects(test_id=0), self.table.objects(self.table.column('test_id') == 0)):
q = q.order_by('attempt_id') q = q.order_by('attempt_id')
expected_order = [0,1,2,3] expected_order = [0, 1, 2, 3]
iter1 = iter(q) iter1 = iter(q)
iter2 = iter(q) iter2 = iter(q)
for attempt_id in expected_order: for attempt_id in expected_order:
@@ -280,6 +281,7 @@ class TestNamedWithMV(BasicSharedKeyspaceUnitTestCase):
def tearDown(self): def tearDown(self):
models.DEFAULT_KEYSPACE = self.default_keyspace models.DEFAULT_KEYSPACE = self.default_keyspace
setup_connection(models.DEFAULT_KEYSPACE)
def test_named_table_with_mv(self): def test_named_table_with_mv(self):
""" """

1
tests/integration/cqlengine/test_consistency.py
View File

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

1
tests/integration/standard/test_cython_protocol_handlers.py
View File

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