Skip to content

Commit d567c05

Browse files
committed
ci: remove unnecessary Django test apps and add others inadvertently removed
Also, correctly categorize some skips. refs #317
1 parent 622dc1d commit d567c05

File tree

2 files changed

+31
-41
lines changed

2 files changed

+31
-41
lines changed

.travis.yml

+23-19
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,55 @@ env:
77
- GOOGLE_APPLICATION_CREDENTIALS=~/creds.json
88
- RUNNING_SPANNER_BACKEND_TESTS=1
99
jobs:
10-
- DJANGO_TEST_APPS="absolute_url_overrides admin_autodiscover admin_changelist admin_custom_urls"
11-
- DJANGO_TEST_APPS="admin_default_site admin_docs"
10+
- DJANGO_TEST_APPS="admin_changelist admin_custom_urls"
11+
- DJANGO_TEST_APPS="admin_docs"
1212
- DJANGO_TEST_APPS="admin_inlines admin_ordering"
1313
- DJANGO_TEST_APPS="aggregation"
1414
- DJANGO_TEST_APPS="aggregation_regress annotations"
15-
- DJANGO_TEST_APPS="app_loading"
1615
# Commented out because they take longer 2hr and TravisCI unconditionally terminates them.
1716
# - DJANGO_TEST_APPS="auth_tests"
18-
- DJANGO_TEST_APPS="base bash_completion basic"
19-
- DJANGO_TEST_APPS="bulk_create choices csrf_tests custom_columns"
17+
- DJANGO_TEST_APPS="basic"
18+
- DJANGO_TEST_APPS="bulk_create choices custom_columns"
2019
- DJANGO_TEST_APPS="cache"
2120
- DJANGO_TEST_APPS="custom_methods custom_pk datatypes"
22-
- DJANGO_TEST_APPS="dates datetimes decorators defer"
21+
- DJANGO_TEST_APPS="dates datetimes defer"
2322
- DJANGO_TEST_APPS="defer_regress"
2423
- DJANGO_TEST_APPS="delete_regress"
25-
- DJANGO_TEST_APPS="deprecation db_functions db_utils dispatch"
24+
- DJANGO_TEST_APPS="db_functions db_utils"
2625
- DJANGO_TEST_APPS="distinct_on_fields empty expressions_window"
27-
- DJANGO_TEST_APPS="field_defaults field_subclassing file_storage file_uploads files"
28-
- DJANGO_TEST_APPS="fixtures fixtures_model_package"
26+
- DJANGO_TEST_APPS="field_defaults field_subclassing file_storage file_uploads"
27+
- DJANGO_TEST_APPS="fixtures fixtures_model_package from_db_value"
2928
- DJANGO_TEST_APPS="get_earliest_or_latest get_object_or_404"
30-
- DJANGO_TEST_APPS="handlers httpwrappers humanize_tests i18n"
29+
- DJANGO_TEST_APPS="i18n"
3130
- DJANGO_TEST_APPS="indexes inline_formsets introspection invalid_models_tests"
3231
- DJANGO_TEST_APPS="known_related_objects lookup max_lengths m2m_and_m2o m2m_intermediary m2m_multiple"
3332
- DJANGO_TEST_APPS="m2m_recursive m2m_regress m2m_signals m2m_through"
3433
- DJANGO_TEST_APPS="m2m_through_regress m2o_recursive managers_regress many_to_many"
35-
- DJANGO_TEST_APPS="mail many_to_one"
34+
- DJANGO_TEST_APPS="many_to_one"
3635
- DJANGO_TEST_APPS="many_to_one_null max_lengths"
37-
- DJANGO_TEST_APPS="messages_tests middleware middleware_exceptions"
3836
- DJANGO_TEST_APPS="migrate_signals migration_test_data_persistence"
37+
# Run model_fields piecemeal because running it all at once takes
38+
# longer then 2 hours (Travis CI limit).
39+
- DJANGO_TEST_APPS="model_fields.test_binaryfield model_fields.test_booleanfield model_fields.test_charfield"
40+
- DJANGO_TEST_APPS="model_fields.test_datetimefield model_fields.test_decimalfield model_fields.test_durationfield"
41+
- DJANGO_TEST_APPS="model_fields.test_field_flags model_fields.test_filefield model_fields.test_floatfield"
42+
- DJANGO_TEST_APPS="model_fields.test_foreignkey model_fields.test_genericipaddressfield model_fields.test_imagefield"
43+
- DJANGO_TEST_APPS="model_fields.test_integerfield model_fields.test_manytomanyfield model_fields.test_promises"
44+
- DJANGO_TEST_APPS="model_fields.test_slugfield model_fields.test_textfield model_fields.test_uuid"
3945
- DJANGO_TEST_APPS="null_fk null_fk_ordering null_queries one_to_one or_lookups ordering"
4046
- DJANGO_TEST_APPS="queries.test_bulk_update queries.test_explain queries.test_iterator"
4147
- DJANGO_TEST_APPS="queries.test_q queries.test_qs_combinators queries.test_query"
4248
# Commented out because they take longer 2hr and TravisCI unconditionally terminates them.
4349
# - DJANGO_TEST_APPS="queries.tests"
44-
- DJANGO_TEST_APPS="raw_query reserved_names reverse_lookup"
50+
- DJANGO_TEST_APPS="raw_query redirects_tests reserved_names reverse_lookup"
4551
- DJANGO_TEST_APPS="save_delete_hooks select_related"
4652
- DJANGO_TEST_APPS="select_related_onetoone signing sitemaps_tests"
47-
- DJANGO_TEST_APPS="staticfiles_tests str"
4853
- DJANGO_TEST_APPS="string_lookup signals"
49-
- DJANGO_TEST_APPS="template_backends template_tests templates test_utils"
50-
- DJANGO_TEST_APPS="test_client test_client_regress test_exceptions transactions"
54+
- DJANGO_TEST_APPS="test_utils"
55+
- DJANGO_TEST_APPS="test_client test_client_regress timezones transactions"
5156
- DJANGO_TEST_APPS="unmanaged_models update_only_fields"
52-
- DJANGO_TEST_APPS="update urlpatterns urlpatterns_reverse"
53-
- DJANGO_TEST_APPS="utils_tests validators"
54-
- DJANGO_TEST_APPS="validation version view_tests wsgi"
57+
- DJANGO_TEST_APPS="update"
58+
- DJANGO_TEST_APPS="validation view_tests"
5559

5660
python:
5761
- "3.7"

spanner/django/features.py

+8-22
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ class DatabaseFeatures(BaseDatabaseFeatures):
4343
'queries.test_bulk_update.BulkUpdateNoteTests.test_unsaved_models',
4444
'timezones.tests.LegacyDatabaseTests.test_cursor_execute_accepts_naive_datetime',
4545
'timezones.tests.NewDatabaseTests.test_cursor_execute_accepts_naive_datetime',
46+
'validation.test_custom_messages.CustomMessagesTests.test_custom_null_message',
47+
'validation.test_custom_messages.CustomMessagesTests.test_custom_simple_validator_message',
48+
'validation.test_unique.PerformUniqueChecksTest.test_primary_key_unique_check_not_performed_when_adding_and_pk_not_specified', # noqa
49+
'validation.test_unique.PerformUniqueChecksTest.test_primary_key_unique_check_not_performed_when_not_adding',
50+
'validation.test_validators.TestModelsWithValidators.test_custom_validator_passes_for_correct_value',
51+
'validation.test_validators.TestModelsWithValidators.test_custom_validator_raises_error_for_incorrect_value',
52+
'validation.test_validators.TestModelsWithValidators.test_field_validators_can_be_any_iterable',
4653
# Tests that assume a serial pk.
4754
'admin_filters.tests.ListFiltersTests.test_booleanfieldlistfilter_nullbooleanfield',
4855
'admin_filters.tests.ListFiltersTests.test_booleanfieldlistfilter_tuple',
@@ -147,6 +154,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
147154
'model_fields.test_decimalfield.DecimalFieldTests.test_fetch_from_db_without_float_rounding',
148155
'model_fields.test_decimalfield.DecimalFieldTests.test_roundtrip_with_trailing_zeros',
149156
# No UNIQUE constraints in Spanner.
157+
'auth_tests.test_basic.BasicTestCase.test_unicode_username',
150158
'model_fields.test_filefield.FileFieldTests.test_unique_when_same_filename',
151159
'one_to_one.tests.OneToOneTests.test_multiple_o2o',
152160
# No CHECK constraints in Spanner.
@@ -216,28 +224,9 @@ class DatabaseFeatures(BaseDatabaseFeatures):
216224
# casting DateField to DateTimeField adds an unexpected hour:
217225
# https://github.com/orijtech/spanner-orm/issues/260
218226
'db_functions.comparison.test_cast.CastTests.test_cast_from_db_date_to_datetime',
219-
# Did not expect to issue a SQL statement:
220-
# https://github.com/orijtech/spanner-orm/issues/266
221-
'validation.test_unique.PerformUniqueChecksTest.test_primary_key_unique_check_not_performed_when_adding_and_pk_not_specified', # noqa
222-
'validation.test_unique.PerformUniqueChecksTest.test_primary_key_unique_check_not_performed_when_not_adding',
223-
# Database queries are issued to 'default' but shouldn't be:
224-
# https://github.com/orijtech/spanner-orm/issues/267
225-
'validation.test_custom_messages.CustomMessagesTests.test_custom_null_message',
226-
'validation.test_custom_messages.CustomMessagesTests.test_custom_simple_validator_message',
227-
'validation.test_validators.TestModelsWithValidators.test_custom_validator_passes_for_correct_value',
228-
'validation.test_validators.TestModelsWithValidators.test_custom_validator_raises_error_for_incorrect_value',
229-
'validation.test_validators.TestModelsWithValidators.test_field_validators_can_be_any_iterable',
230-
# Invalid table names aren't supported:
231-
# https://github.com/orijtech/spanner-orm/issues/268
232-
'backends',
233-
# Cloud Spanner supports Unicode as the native encoding yet Django
234-
# doesn't expect the backend to support it, so skip this test.
235-
'auth_tests.test_basic.BasicTestCase.test_unicode_username',
236227
# Obscure error with auth_tests:
237228
# https://github.com/orijtech/spanner-orm/issues/271
238229
'auth_tests.test_admin_multidb.MultiDatabaseTests.test_add_view',
239-
# We can't run GIS tests on a non-GIS database.
240-
'gis_tests',
241230
# Tests that by-pass using spanner.django and generate
242231
# invalid DDL: https://github.com/orijtech/django-spanner/issues/298
243232
'cache.tests.CreateCacheTableForDBCacheTests',
@@ -246,9 +235,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
246235
# A rollback failed and should be investigated:
247236
# https://github.com/orijtech/django-spanner/issues/299
248237
'test_utils.tests.TestBadSetUpTestData.test_failure_in_setUpTestData_should_rollback_transaction',
249-
# The default object being compared against apparently shouldn't have an assigned id.
250-
# https://github.com/orijtech/django-spanner/issues/300
251-
'str.tests.SimpleTests.test_defaults',
252238
# Spanner doesn't support views.
253239
'inspectdb.tests.InspectDBTransactionalTests.test_include_views',
254240
'introspection.tests.IntrospectionTests.test_table_names_with_views',

0 commit comments

Comments
 (0)