tests/integration: Rename some skip/xfail decorators

Renamed some decorators (those that I previously added) from lowercase
to lowercase with underscores (as advised by PEP 8 for functions - which
a decorator is). I changed newly added decorators, didn't yet touch
older ones - still need to decide wheter to do it.

Author: Lorak-mmk

tests/integration/__init__.py

@@ -366,8 +366,8 @@ def _id_and_mark(f):
 lessthandse51 = unittest.skipUnless(DSE_VERSION and DSE_VERSION < Version('5.1'), "DSE version less than 5.1 required")
 lessthandse60 = unittest.skipUnless(DSE_VERSION and DSE_VERSION < Version('6.0'), "DSE version less than 6.0 required")
 
-requirescollectionindexes = unittest.skipUnless(SCYLLA_VERSION is None or Version(SCYLLA_VERSION.split(':')[1]) >= Version('5.2'), 'Test requires Scylla >= 5.2 or Cassandra')
-requirescustomindexes = unittest.skipUnless(SCYLLA_VERSION is None, 'Currently, Scylla does not support SASI or any other CUSTOM INDEX class.')
+requires_collection_indexes = unittest.skipUnless(SCYLLA_VERSION is None or Version(SCYLLA_VERSION.split(':')[1]) >= Version('5.2'), 'Test requires Scylla >= 5.2 or Cassandra')
+requires_custom_indexes = unittest.skipUnless(SCYLLA_VERSION is None, 'Currently, Scylla does not support SASI or any other CUSTOM INDEX class.')
 
 pypy = unittest.skipUnless(platform.python_implementation() == "PyPy", "Test is skipped unless it's on PyPy")
 notpy3 = unittest.skipIf(sys.version_info >= (3, 0), "Test not applicable for Python 3.x runtime")

tests/integration/cqlengine/management/test_management.py

@@ -24,7 +24,7 @@
 from cassandra.cqlengine.models import Model
 from cassandra.cqlengine import columns
 
-from tests.integration import DSE_VERSION, PROTOCOL_VERSION, greaterthancass20, requirescollectionindexes, MockLoggingHandler, CASSANDRA_VERSION
+from tests.integration import DSE_VERSION, PROTOCOL_VERSION, greaterthancass20, requires_collection_indexes, MockLoggingHandler, CASSANDRA_VERSION
 from tests.integration.cqlengine.base import BaseCassEngTestCase
 from tests.integration.cqlengine.query.test_queryset import TestModel
 from cassandra.cqlengine.usertype import UserType
@@ -427,7 +427,7 @@ def test_sync_index_case_sensitive(self):
         self.assertIsNotNone(management._get_index_name_by_column(table_meta, 'second_key'))
 
     @greaterthancass20
-    @requirescollectionindexes
+    @requires_collection_indexes
     def test_sync_indexed_set(self):
         """
         Tests that models that have container types with indices can be synced.

tests/integration/cqlengine/query/test_named.py

@@ -27,7 +27,7 @@
 from tests.integration.cqlengine.query.test_queryset import BaseQuerySetUsage
 
 
-from tests.integration import BasicSharedKeyspaceUnitTestCase, greaterthanorequalcass30, requirescollectionindexes
+from tests.integration import BasicSharedKeyspaceUnitTestCase, greaterthanorequalcass30, requires_collection_indexes
 
 
 class TestQuerySetOperation(BaseCassEngTestCase):
@@ -118,7 +118,7 @@ def test_query_expression_where_clause_generation(self):
         self.assertIsInstance(where.operator, GreaterThanOrEqualOperator)
         self.assertEqual(where.value, 1)
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):
 
     @classmethod

tests/integration/cqlengine/query/test_queryset.py

@@ -39,7 +39,7 @@
 from cassandra.util import uuid_from_time
 from cassandra.cqlengine.connection import get_session
 from tests.integration import PROTOCOL_VERSION, CASSANDRA_VERSION, greaterthancass20, greaterthancass21, \
-    greaterthanorequalcass30, TestCluster, requirescollectionindexes
+    greaterthanorequalcass30, TestCluster, requires_collection_indexes
 from tests.integration.cqlengine import execute_count, DEFAULT_KEYSPACE
 
 
@@ -384,7 +384,7 @@ def tearDownClass(cls):
         drop_table(CustomIndexedTestModel)
         drop_table(TestMultiClusteringModel)
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):
 
     @execute_count(2)
@@ -558,7 +558,7 @@ class NonEqualityFilteringModel(Model):
     num = qa.count()
     assert num == 1, num
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestQuerySetDistinct(BaseQuerySetUsage):
 
     @execute_count(1)
@@ -597,7 +597,7 @@ def test_distinct_with_explicit_count(self):
         self.assertEqual(q.count(), 2)
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestQuerySetOrdering(BaseQuerySetUsage):
     @execute_count(2)
     def test_order_by_success_case(self):
@@ -646,7 +646,7 @@ def test_ordering_on_multiple_clustering_columns(self):
         assert [r.three for r in results] == [1, 2, 3, 4, 5]
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestQuerySetSlicing(BaseQuerySetUsage):
 
     @execute_count(1)
@@ -701,7 +701,7 @@ def test_negative_slicing(self):
             self.assertEqual(model.attempt_id, expect)
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestQuerySetValidation(BaseQuerySetUsage):
 
     def test_primary_key_or_index_must_be_specified(self):
@@ -783,7 +783,7 @@ def test_custom_indexed_field_can_be_queried(self):
         list(CustomIndexedTestModel.objects.filter(test_id=1, description='test'))
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestQuerySetDelete(BaseQuerySetUsage):
 
     @execute_count(9)
@@ -942,7 +942,7 @@ def test_success_case(self):
         assert '4' in datas
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestInOperator(BaseQuerySetUsage):
     @execute_count(1)
     def test_kwarg_success_case(self):
@@ -1003,7 +1003,7 @@ class bool_model2(Model):
 
 
 @greaterthancass20
-@requirescollectionindexes
+@requires_collection_indexes
 class TestContainsOperator(BaseQuerySetUsage):
 
     @execute_count(6)
@@ -1069,7 +1069,7 @@ def test_query_expression_success_case(self):
             self.assertEqual(q.count(), 0)
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestValuesList(BaseQuerySetUsage):
 
     @execute_count(2)
@@ -1082,7 +1082,7 @@ def test_values_list(self):
         assert item == 10
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class TestObjectsProperty(BaseQuerySetUsage):
     @execute_count(1)
     def test_objects_property_returns_fresh_queryset(self):
@@ -1113,7 +1113,7 @@ class PagingTest(Model):
         assert len(results) == 2
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class ModelQuerySetTimeoutTestCase(BaseQuerySetUsage):
     def test_default_timeout(self):
         with mock.patch.object(Session, 'execute') as mock_execute:
@@ -1131,7 +1131,7 @@ def test_none_timeout(self):
             self.assertEqual(mock_execute.call_args[-1]['timeout'], None)
 
 
-@requirescollectionindexes
+@requires_collection_indexes
 class DMLQueryTimeoutTestCase(BaseQuerySetUsage):
     def setUp(self):
         self.model = TestModel(test_id=1, attempt_id=1, description='timeout test')

tests/integration/cqlengine/statements/test_base_statement.py

@@ -26,7 +26,7 @@
 
 from tests.integration.cqlengine.base import BaseCassEngTestCase, TestQueryUpdateModel
 from tests.integration.cqlengine import DEFAULT_KEYSPACE
-from tests.integration import greaterthanorequalcass3_10, requirescustomindexes, TestCluster
+from tests.integration import greaterthanorequalcass3_10, requires_custom_indexes, TestCluster
 
 from cassandra.cqlengine.connection import execute
 
@@ -102,7 +102,7 @@ def test_insert_statement_execute(self):
         self.assertEqual(TestQueryUpdateModel.objects.count(), 0)
 
     @greaterthanorequalcass3_10
-    @requirescustomindexes
+    @requires_custom_indexes
     def test_like_operator(self):
         """
         Test to verify the like operator works appropriately