re-run

IlyaFaer · IlyaFaer · commit 4a2397326d5d · 2020-12-07T15:07:12.000+03:00
diff --git a/.github/workflows/django_tests_against_emulator.yml b/.github/workflows/django_tests_against_emulator.yml
@@ -28,6 +28,7 @@ jobs:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project
           GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true
+          RUNNING_SPANNER_BACKEND_TESTS: 1
           DJANGO_WORKER_INDEX: 0
           DJANGO_WORKER_COUNT: 1
           SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests
diff --git a/django_spanner/features.py b/django_spanner/features.py
@@ -326,17 +326,13 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "model_formsets.tests.ModelFormsetTest.test_prevent_change_outer_model_and_create_invalid_data",
         "model_formsets_regress.tests.FormfieldShouldDeleteFormTests.test_no_delete",
         "model_formsets_regress.tests.FormsetTests.test_extraneous_query_is_not_run",
+        # os.chmod() doesn't work on Kokoro?
+        "file_uploads.tests.DirectoryCreationTests.test_readonly_root",
+        # Tests that sometimes fail on Kokoro for unknown reasons.
+        "contenttypes_tests.test_models.ContentTypesTests.test_cache_not_shared_between_managers",
+        "migration_test_data_persistence.tests.MigrationDataNormalPersistenceTestCase.test_persistence",
+        "servers.test_liveserverthread.LiveServerThreadTest.test_closes_connections",
     )
-    # Kokoro-specific skips.
-    if os.environ.get("KOKORO_JOB_NAME"):
-        skip_tests += (
-            # os.chmod() doesn't work on Kokoro?
-            "file_uploads.tests.DirectoryCreationTests.test_readonly_root",
-            # Tests that sometimes fail on Kokoro for unknown reasons.
-            "contenttypes_tests.test_models.ContentTypesTests.test_cache_not_shared_between_managers",
-            "migration_test_data_persistence.tests.MigrationDataNormalPersistenceTestCase.test_persistence",
-            "servers.test_liveserverthread.LiveServerThreadTest.test_closes_connections",
-        )
 
     if os.environ.get("SPANNER_EMULATOR_HOST", None):
         # Some code isn't yet supported by the Spanner emulator.
diff --git a/django_test_suite.sh b/django_test_suite.sh
@@ -9,21 +9,22 @@ set -x pipefail
 # Disable buffering, so that the logs stream through.
 export PYTHONUNBUFFERED=1
 
-# Export essential environment variables for Django tests.
-export RUNNING_SPANNER_BACKEND_TESTS=1
+sudo apt-get update -y
+sudo apt-get install -y libmemcached-dev
 
 pip3 install .
 pip3 uninstall -y google-cloud-spanner
+pip3 uninstall -y django-google-spanner
 pip3 install -e 'git+https://github.com/q-logic/python-spanner.git@autocommit_change#egg=google-cloud-spanner'
+pip3 install -e 'git+https://github.com/q-logic/python-spanner-django.git@dj_tests_against_emulator#egg=django-google-spanner'
 
-# Create a unique DJANGO_TESTS_DIR per worker to avoid
-# any clashes with configured tests by other workers.
-export DJANGO_TESTS_DIR="django_tests_$DJANGO_WORKER_INDEX"
+export DJANGO_TESTS_DIR="django_tests_dir"
 mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch spanner-2.2.x https://github.com/timgraham/django.git $DJANGO_TESTS_DIR/django
 
 # Install dependencies for Django tests.
 sudo apt-get update
-apt-get install -y libffi-dev libjpeg-dev zlib1g-dev libmemcached-dev
+sudo apt-get install -y libffi-dev libjpeg-dev zlib1g-devel
+
 cd $DJANGO_TESTS_DIR/django && pip3 install -e . && pip3 install -r tests/requirements/py3.txt; cd ../../
 
 python3 create_test_instance.py
@@ -65,11 +66,6 @@ PASSWORD_HASHERS = [
 !
 }
 
-run_django_tests() {
-    cd $TESTS_DIR/django/tests
-    create_settings
-    echo -e "\033[32mRunning Django tests: $TEST_APPS\033[00m"
-    python3 runtests.py $TEST_APPS --verbosity=2 --noinput --settings $SETTINGS_FILE
-}
-
-run_django_tests
+cd $TESTS_DIR/django/tests
+create_settings
+python3 runtests.py admin_changelist admin_docs admin_filters admin_inlines admin_ordering admin_utils admin_views aggregation aggregation_regress annotations auth_tests backends basic bulk_create cache choices constraints contenttypes_tests custom_columns custom_lookups custom_managers custom_methods custom_pk datatypes dates datetimes db_functions defer defer_regress delete delete_regress distinct_on_fields empty expressions expressions_case expressions_window extra_regress field_defaults file_storage file_uploads filtered_relation fixtures fixtures_model_package fixtures_regress flatpages_tests force_insert_update foreign_object forms_tests from_db_value generic_inline_admin generic_relations generic_relations_regress generic_views get_earliest_or_latest get_object_or_404 get_or_create i18n indexes inline_formsets inspectdb introspection invalid_models_tests known_related_objects lookup m2m_and_m2o m2m_intermediary m2m_multiple m2m_recursive m2m_regress m2m_signals m2m_through m2m_through_regress m2o_recursive managers_regress many_to_many many_to_one many_to_one_null max_lengths migrate_signals migrations migration_test_data_persistence modeladmin model_fields model_forms model_formsets model_formsets_regress model_indexes model_inheritance model_inheritance_regress model_options model_package model_regress multiple_database mutually_referential nested_foreign_keys null_fk null_fk_ordering null_queries one_to_one ordering order_with_respect_to or_lookups prefetch_related proxy_model_inheritance proxy_models queries queryset_pickle raw_query redirects_tests reserved_names reverse_lookup save_delete_hooks schema select_for_update select_related select_related_onetoone select_related_regress serializers servers sessions_tests signals sitemaps_tests sites_framework sites_tests string_lookup syndication_tests test_client test_client_regress test_runner test_utils timezones transaction_hooks transactions unmanaged_models update update_only_fields validation view_tests --verbosity=3 --noinput --settings $SETTINGS_FILE
