From 1048f33604fbc48bd9e476fd7e7ae57b4a6f3032 Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Wed, 30 Sep 2015 14:15:46 -0500 Subject: [PATCH] cqle: test cleanup following options refactor --- .../management/test_compaction_settings.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/tests/integration/cqlengine/management/test_compaction_settings.py b/tests/integration/cqlengine/management/test_compaction_settings.py index 85196d33..a6717654 100644 --- a/tests/integration/cqlengine/management/test_compaction_settings.py +++ b/tests/integration/cqlengine/management/test_compaction_settings.py @@ -23,14 +23,7 @@ from cassandra.cqlengine.models import Model from tests.integration.cqlengine.base import BaseCassEngTestCase -class CompactionModel(Model): - - __compaction__ = None - cid = columns.UUID(primary_key=True) - name = columns.Text() - - -class LeveledcompactionTestTable(Model): +class LeveledCompactionTestTable(Model): __options__ = {'compaction': {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy', 'sstable_size_in_mb': '64'}} @@ -42,10 +35,10 @@ class LeveledcompactionTestTable(Model): class AlterTableTest(BaseCassEngTestCase): def test_alter_is_called_table(self): - drop_table(LeveledcompactionTestTable) - sync_table(LeveledcompactionTestTable) + drop_table(LeveledCompactionTestTable) + sync_table(LeveledCompactionTestTable) with patch('cassandra.cqlengine.management._update_options') as mock: - sync_table(LeveledcompactionTestTable) + sync_table(LeveledCompactionTestTable) assert mock.called == 1 def test_compaction_not_altered_without_changes_leveled(self): @@ -82,7 +75,7 @@ class AlterTableTest(BaseCassEngTestCase): self.assertFalse(_update_options(SizeTieredCompactionChangesDetectionTest)) def test_alter_actually_alters(self): - tmp = copy.deepcopy(LeveledcompactionTestTable) + tmp = copy.deepcopy(LeveledCompactionTestTable) drop_table(tmp) sync_table(tmp) tmp.__options__ = {'compaction': {'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'}}