diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index 8c31bf85b6..53683c32bd 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -1060,6 +1060,8 @@ def assert_startswith(s, prefix): class TestCluster(object): + __test__ = False + DEFAULT_PROTOCOL_VERSION = default_protocol_version DEFAULT_CASSANDRA_IP = CASSANDRA_IP DEFAULT_ALLOW_BETA = ALLOW_BETA_PROTOCOL diff --git a/tests/integration/cqlengine/advanced/test_cont_paging.py b/tests/integration/cqlengine/advanced/test_cont_paging.py index 89e05950e3..95fb7dc837 100644 --- a/tests/integration/cqlengine/advanced/test_cont_paging.py +++ b/tests/integration/cqlengine/advanced/test_cont_paging.py @@ -28,6 +28,8 @@ class TestMultiKeyModel(models.Model): + __test__ = False + partition = columns.Integer(primary_key=True) cluster = columns.Integer(primary_key=True) count = columns.Integer(required=False) diff --git a/tests/integration/cqlengine/base.py b/tests/integration/cqlengine/base.py index bdb62aa2a3..ca8c6b0be1 100644 --- a/tests/integration/cqlengine/base.py +++ b/tests/integration/cqlengine/base.py @@ -22,6 +22,7 @@ from uuid import uuid4 class TestQueryUpdateModel(Model): + __test__ = False partition = columns.UUID(primary_key=True, default=uuid4) cluster = columns.Integer(primary_key=True) diff --git a/tests/integration/cqlengine/columns/test_container_columns.py b/tests/integration/cqlengine/columns/test_container_columns.py index 1f51770eac..4c21ff55d8 100644 --- a/tests/integration/cqlengine/columns/test_container_columns.py +++ b/tests/integration/cqlengine/columns/test_container_columns.py @@ -35,6 +35,8 @@ class TestSetModel(Model): + __test__ = False + partition = columns.UUID(primary_key=True, default=uuid4) int_set = columns.Set(columns.Integer, required=False) text_set = columns.Set(columns.Text, required=False) @@ -193,6 +195,7 @@ def test_default_empty_container_saving(self): class TestListModel(Model): + __test__ = False partition = columns.UUID(primary_key=True, default=uuid4) int_list = columns.List(columns.Integer, required=False) @@ -347,6 +350,8 @@ def test_blind_list_updates_from_none(self): class TestMapModel(Model): + __test__ = False + partition = columns.UUID(primary_key=True, default=uuid4) int_map = columns.Map(columns.Integer, columns.UUID, required=False) text_map = columns.Map(columns.Text, columns.DateTime, required=False) @@ -525,6 +530,7 @@ def test_default_empty_container_saving(self): class TestCamelMapModel(Model): + __test__ = False partition = columns.UUID(primary_key=True, default=uuid4) camelMap = columns.Map(columns.Text, columns.Integer, required=False) @@ -546,6 +552,7 @@ def test_camelcase_column(self): class TestTupleModel(Model): + __test__ = False partition = columns.UUID(primary_key=True, default=uuid4) int_tuple = columns.Tuple(columns.Integer, columns.Integer, columns.Integer, required=False) @@ -746,6 +753,7 @@ def test_blind_tuple_updates_from_none(self): class TestNestedModel(Model): + __test__ = False partition = columns.UUID(primary_key=True, default=uuid4) list_list = columns.List(columns.List(columns.Integer), required=False) diff --git a/tests/integration/cqlengine/columns/test_counter_column.py b/tests/integration/cqlengine/columns/test_counter_column.py index 95792dd452..160b98d7c2 100644 --- a/tests/integration/cqlengine/columns/test_counter_column.py +++ b/tests/integration/cqlengine/columns/test_counter_column.py @@ -21,6 +21,7 @@ class TestCounterModel(Model): + __test__ = False partition = columns.UUID(primary_key=True, default=uuid4) cluster = columns.UUID(primary_key=True, default=uuid4) diff --git a/tests/integration/cqlengine/columns/test_static_column.py b/tests/integration/cqlengine/columns/test_static_column.py index 0e8ace8c8f..e5d63c29bb 100644 --- a/tests/integration/cqlengine/columns/test_static_column.py +++ b/tests/integration/cqlengine/columns/test_static_column.py @@ -28,6 +28,8 @@ STATIC_SUPPORTED = PROTOCOL_VERSION >= 2 class TestStaticModel(Model): + __test__ = False + partition = columns.UUID(primary_key=True, default=uuid4) cluster = columns.UUID(primary_key=True, default=uuid4) static = columns.Text(static=True) diff --git a/tests/integration/cqlengine/connections/test_connection.py b/tests/integration/cqlengine/connections/test_connection.py index 92b6992573..c63836785e 100644 --- a/tests/integration/cqlengine/connections/test_connection.py +++ b/tests/integration/cqlengine/connections/test_connection.py @@ -29,6 +29,7 @@ class TestConnectModel(Model): + __test__ = False id = columns.Integer(primary_key=True) keyspace = columns.Text() diff --git a/tests/integration/cqlengine/management/test_management.py b/tests/integration/cqlengine/management/test_management.py index edff6373c3..75c0716cfc 100644 --- a/tests/integration/cqlengine/management/test_management.py +++ b/tests/integration/cqlengine/management/test_management.py @@ -372,6 +372,8 @@ def test_sync_warnings(self): class TestIndexSetModel(Model): + __test__ = False + partition = columns.UUID(primary_key=True) int_set = columns.Set(columns.Integer, index=True) int_list = columns.List(columns.Integer, index=True) diff --git a/tests/integration/cqlengine/model/test_equality_operations.py b/tests/integration/cqlengine/model/test_equality_operations.py index 3b40ed4bf3..f01bde0d29 100644 --- a/tests/integration/cqlengine/model/test_equality_operations.py +++ b/tests/integration/cqlengine/model/test_equality_operations.py @@ -21,6 +21,7 @@ from cassandra.cqlengine import columns class TestModel(Model): + __test__ = False id = columns.UUID(primary_key=True, default=lambda:uuid4()) count = columns.Integer() diff --git a/tests/integration/cqlengine/model/test_model_io.py b/tests/integration/cqlengine/model/test_model_io.py index 3c4088cc83..7195d685fb 100644 --- a/tests/integration/cqlengine/model/test_model_io.py +++ b/tests/integration/cqlengine/model/test_model_io.py @@ -36,6 +36,7 @@ class TestModel(Model): + __test__ = False id = columns.UUID(primary_key=True, default=lambda: uuid4()) count = columns.Integer() @@ -44,6 +45,8 @@ class TestModel(Model): class TestModelSave(Model): + __test__ = False + partition = columns.UUID(primary_key=True, default=uuid4) cluster = columns.Integer(primary_key=True) count = columns.Integer(required=False) @@ -302,6 +305,7 @@ class FloatingPointModel(Model): class TestMultiKeyModel(Model): + __test__ = False partition = columns.Integer(primary_key=True) cluster = columns.Integer(primary_key=True) @@ -658,6 +662,7 @@ def test_reserved_cql_words_can_be_used_as_column_names(self): class TestQueryModel(Model): + __test__ = False test_id = columns.UUID(primary_key=True, default=uuid4) date = columns.Date(primary_key=True) diff --git a/tests/integration/cqlengine/model/test_updates.py b/tests/integration/cqlengine/model/test_updates.py index 17eed8ddd9..84dbe9ef3e 100644 --- a/tests/integration/cqlengine/model/test_updates.py +++ b/tests/integration/cqlengine/model/test_updates.py @@ -25,6 +25,7 @@ from cassandra.cqlengine.usertype import UserType class TestUpdateModel(Model): + __test__ = False partition = columns.UUID(primary_key=True, default=uuid4) cluster = columns.UUID(primary_key=True, default=uuid4) diff --git a/tests/integration/cqlengine/model/test_value_lists.py b/tests/integration/cqlengine/model/test_value_lists.py index 0c913158cf..8fd7f4b392 100644 --- a/tests/integration/cqlengine/model/test_value_lists.py +++ b/tests/integration/cqlengine/model/test_value_lists.py @@ -22,11 +22,13 @@ class TestModel(Model): + __test__ = False id = columns.Integer(primary_key=True) clustering_key = columns.Integer(primary_key=True, clustering_order='desc') class TestClusteringComplexModel(Model): + __test__ = False id = columns.Integer(primary_key=True) clustering_key = columns.Integer(primary_key=True, clustering_order='desc') diff --git a/tests/integration/cqlengine/query/test_batch_query.py b/tests/integration/cqlengine/query/test_batch_query.py index f0c9c43266..4a45d257fd 100644 --- a/tests/integration/cqlengine/query/test_batch_query.py +++ b/tests/integration/cqlengine/query/test_batch_query.py @@ -27,6 +27,7 @@ class TestMultiKeyModel(Model): + __test__ = False partition = columns.Integer(primary_key=True) cluster = columns.Integer(primary_key=True) diff --git a/tests/integration/cqlengine/query/test_queryset.py b/tests/integration/cqlengine/query/test_queryset.py index a2f9f23d48..668f27117d 100644 --- a/tests/integration/cqlengine/query/test_queryset.py +++ b/tests/integration/cqlengine/query/test_queryset.py @@ -62,6 +62,7 @@ def dst(self, dt): class TestModel(Model): + __test__ = False test_id = columns.Integer(primary_key=True) attempt_id = columns.Integer(primary_key=True) @@ -104,6 +105,7 @@ class IndexedCollectionsTestModel(Model): class TestMultiClusteringModel(Model): + __test__ = False one = columns.Integer(primary_key=True) two = columns.Integer(primary_key=True) @@ -1346,6 +1348,7 @@ def test_db_field_value_list(self): list(DBFieldModel.objects.filter(c0=0, k0=0, k1=0).values_list('c0', 'v0')) class TestModelSmall(Model): + __test__ = False test_id = columns.Integer(primary_key=True) diff --git a/tests/integration/cqlengine/test_batch_query.py b/tests/integration/cqlengine/test_batch_query.py index cd440df291..5906d6bea4 100644 --- a/tests/integration/cqlengine/test_batch_query.py +++ b/tests/integration/cqlengine/test_batch_query.py @@ -22,6 +22,8 @@ from mock import patch class TestMultiKeyModel(Model): + __test__ = False + partition = columns.Integer(primary_key=True) cluster = columns.Integer(primary_key=True) count = columns.Integer(required=False) diff --git a/tests/integration/cqlengine/test_connections.py b/tests/integration/cqlengine/test_connections.py index 15adff3380..32db143088 100644 --- a/tests/integration/cqlengine/test_connections.py +++ b/tests/integration/cqlengine/test_connections.py @@ -26,7 +26,7 @@ class TestModel(Model): - + __test__ = False __keyspace__ = 'ks1' partition = columns.Integer(primary_key=True) diff --git a/tests/integration/cqlengine/test_consistency.py b/tests/integration/cqlengine/test_consistency.py index dc0aa32c64..aa618506de 100644 --- a/tests/integration/cqlengine/test_consistency.py +++ b/tests/integration/cqlengine/test_consistency.py @@ -26,6 +26,7 @@ from tests.integration.cqlengine.base import BaseCassEngTestCase class TestConsistencyModel(Model): + __test__ = False id = columns.UUID(primary_key=True, default=lambda:uuid4()) count = columns.Integer() diff --git a/tests/integration/cqlengine/test_context_query.py b/tests/integration/cqlengine/test_context_query.py index 6f2a161352..8ced5f0f49 100644 --- a/tests/integration/cqlengine/test_context_query.py +++ b/tests/integration/cqlengine/test_context_query.py @@ -20,7 +20,7 @@ class TestModel(Model): - + __test__ = False __keyspace__ = 'ks1' partition = columns.Integer(primary_key=True) diff --git a/tests/integration/cqlengine/test_ifexists.py b/tests/integration/cqlengine/test_ifexists.py index 2e9d4be7ed..c41eaac954 100644 --- a/tests/integration/cqlengine/test_ifexists.py +++ b/tests/integration/cqlengine/test_ifexists.py @@ -26,6 +26,7 @@ class TestIfExistsModel(Model): + __test__ = False id = columns.UUID(primary_key=True, default=lambda: uuid4()) count = columns.Integer() @@ -33,6 +34,7 @@ class TestIfExistsModel(Model): class TestIfExistsModel2(Model): + __test__ = False id = columns.Integer(primary_key=True) count = columns.Integer(primary_key=True, required=False) @@ -40,6 +42,7 @@ class TestIfExistsModel2(Model): class TestIfExistsWithCounterModel(Model): + __test__ = False id = columns.UUID(primary_key=True, default=lambda: uuid4()) likes = columns.Counter() diff --git a/tests/integration/cqlengine/test_ifnotexists.py b/tests/integration/cqlengine/test_ifnotexists.py index 260e132731..f9f944b97a 100644 --- a/tests/integration/cqlengine/test_ifnotexists.py +++ b/tests/integration/cqlengine/test_ifnotexists.py @@ -25,6 +25,7 @@ from tests.integration import PROTOCOL_VERSION class TestIfNotExistsModel(Model): + __test__ = False id = columns.UUID(primary_key=True, default=lambda:uuid4()) count = columns.Integer() @@ -32,6 +33,7 @@ class TestIfNotExistsModel(Model): class TestIfNotExistsWithCounterModel(Model): + __test__ = False id = columns.UUID(primary_key=True, default=lambda:uuid4()) likes = columns.Counter() diff --git a/tests/integration/cqlengine/test_lwt_conditional.py b/tests/integration/cqlengine/test_lwt_conditional.py index 45dbf86c68..5ef9e9211e 100644 --- a/tests/integration/cqlengine/test_lwt_conditional.py +++ b/tests/integration/cqlengine/test_lwt_conditional.py @@ -27,12 +27,16 @@ class TestConditionalModel(Model): + __test__ = False + id = columns.UUID(primary_key=True, default=uuid4) count = columns.Integer() text = columns.Text(required=False) class TestUpdateModel(Model): + __test__ = False + partition = columns.Integer(primary_key=True) cluster = columns.Integer(primary_key=True) value = columns.Integer(required=False) diff --git a/tests/integration/cqlengine/test_timestamp.py b/tests/integration/cqlengine/test_timestamp.py index abf751ec47..251264a265 100644 --- a/tests/integration/cqlengine/test_timestamp.py +++ b/tests/integration/cqlengine/test_timestamp.py @@ -25,6 +25,8 @@ class TestTimestampModel(Model): + __test__ = False + id = columns.UUID(primary_key=True, default=lambda:uuid4()) count = columns.Integer() diff --git a/tests/integration/cqlengine/test_ttl.py b/tests/integration/cqlengine/test_ttl.py index 55457ff56a..186521afd6 100644 --- a/tests/integration/cqlengine/test_ttl.py +++ b/tests/integration/cqlengine/test_ttl.py @@ -29,6 +29,8 @@ class TestTTLModel(Model): + __test__ = False + id = columns.UUID(primary_key=True, default=lambda: uuid4()) count = columns.Integer() text = columns.Text(required=False) @@ -48,6 +50,8 @@ def tearDownClass(cls): class TestDefaultTTLModel(Model): + __test__ = False + __options__ = {'default_time_to_live': 20} id = columns.UUID(primary_key=True, default=lambda:uuid4()) count = columns.Integer() diff --git a/tests/integration/standard/test_connection.py b/tests/integration/standard/test_connection.py index a1b05c3d6f..5568993533 100644 --- a/tests/integration/standard/test_connection.py +++ b/tests/integration/standard/test_connection.py @@ -95,6 +95,8 @@ def test_in_flight_timeout(self): class TestHostListener(HostStateListener): + __test__ = False + host_down = None def on_down(self, host):