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

Don't try to sync table with static if test will be skipped

Browse Source
This commit is contained in:
Adam Holmberg
2015-03-19 11:01:39 -05:00
parent 08adcc76f3
commit fa2e4c77e9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/cqlengine/columns/test_static_column.py
View File

@@ -22,6 +22,9 @@ from cassandra.cqlengine.models import Model
from tests.integration.cqlengine.base import BaseCassEngTestCase from tests.integration.cqlengine.base import BaseCassEngTestCase
from tests.integration import PROTOCOL_VERSION from tests.integration import PROTOCOL_VERSION
# TODO: is this really a protocol limitation, or is it just C* version?
# good enough proxy for now
STATIC_SUPPORTED = PROTOCOL_VERSION >= 2
class TestStaticModel(Model): class TestStaticModel(Model):
partition = columns.UUID(primary_key=True, default=uuid4) partition = columns.UUID(primary_key=True, default=uuid4)
@@ -30,13 +33,14 @@ class TestStaticModel(Model):
text = columns.Text() text = columns.Text()
@skipUnless(PROTOCOL_VERSION >= 2, "only runs against the cql3 protocol v2.0") @skipUnless(STATIC_SUPPORTED, "only runs against the cql3 protocol v2.0")
class TestStaticColumn(BaseCassEngTestCase): class TestStaticColumn(BaseCassEngTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(TestStaticColumn, cls).setUpClass() super(TestStaticColumn, cls).setUpClass()
drop_table(TestStaticModel) drop_table(TestStaticModel)
if STATIC_SUPPORTED: # setup and teardown run regardless of skip
sync_table(TestStaticModel) sync_table(TestStaticModel)
@classmethod @classmethod