From a2759ddd974482b3053e7c183cd9d437ef2b8f6b Mon Sep 17 00:00:00 2001 From: Jon Haddad Date: Tue, 7 Oct 2014 20:31:03 -0700 Subject: [PATCH] only check caching on c < 2.1 --- cqlengine/tests/management/test_management.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cqlengine/tests/management/test_management.py b/cqlengine/tests/management/test_management.py index d42cd69a..3bda88ed 100644 --- a/cqlengine/tests/management/test_management.py +++ b/cqlengine/tests/management/test_management.py @@ -146,7 +146,6 @@ class TablePropertiesTests(BaseCassEngTestCase): sync_table(ModelWithTableProperties) expected = {'bloom_filter_fp_chance': 0.76328, - 'caching': CACHING_ALL, 'comment': 'TxfguvBdzwROQALmQBOziRMbkqVGFjqcJfVhwGR', 'gc_grace_seconds': 2063, 'read_repair_chance': 0.17985, @@ -157,6 +156,7 @@ class TablePropertiesTests(BaseCassEngTestCase): # 'local_read_repair_chance': 0.50811, } if CASSANDRA_VERSION <= 20: + expected['caching'] = CACHING_ALL expected['replicate_on_write'] = False if CASSANDRA_VERSION == 20: @@ -190,7 +190,6 @@ class TablePropertiesTests(BaseCassEngTestCase): table_settings = management.get_table_settings(ModelWithTableProperties).options expected = {'bloom_filter_fp_chance': 0.66778, - 'caching': CACHING_NONE, 'comment': 'xirAkRWZVVvsmzRvXamiEcQkshkUIDINVJZgLYSdnGHweiBrAiJdLJkVohdRy', 'gc_grace_seconds': 96362, 'read_repair_chance': 0.2989, @@ -205,6 +204,7 @@ class TablePropertiesTests(BaseCassEngTestCase): # these featuers removed in cassandra 2.1 if CASSANDRA_VERSION <= 20: + expected['caching'] = CACHING_NONE expected['replicate_on_write'] = True expected['populate_io_cache_on_flush'] = False