diff --git a/.github/workflows/django_tests_against_emulator0.yml b/.github/workflows/django_tests_against_emulator0.yml deleted file mode 100644 index 6e02edd369..0000000000 --- a/.github/workflows/django_tests_against_emulator0.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests0 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: model_fields model_forms diff --git a/.github/workflows/django_tests_against_emulator1.yml b/.github/workflows/django_tests_against_emulator1.yml deleted file mode 100644 index a8689d71c5..0000000000 --- a/.github/workflows/django_tests_against_emulator1.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests1 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: mutually_referential nested_foreign_keys null_fk null_fk_ordering null_queries one_to_one ordering order_with_respect_to or_lookups diff --git a/.github/workflows/django_tests_against_emulator10.yml b/.github/workflows/django_tests_against_emulator10.yml deleted file mode 100644 index f2dae26f52..0000000000 --- a/.github/workflows/django_tests_against_emulator10.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests10 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: select_related select_related_onetoone select_related_regress queryset_pickle diff --git a/.github/workflows/django_tests_against_emulator11.yml b/.github/workflows/django_tests_against_emulator11.yml deleted file mode 100644 index 6c6cac8b9a..0000000000 --- a/.github/workflows/django_tests_against_emulator11.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests11 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: transaction_hooks transactions unmanaged_models update update_only_fields validation admin_changelist admin_docs view_tests many_to_many many_to_one many_to_one_null diff --git a/.github/workflows/django_tests_against_emulator12.yml b/.github/workflows/django_tests_against_emulator12.yml deleted file mode 100644 index 26d4151b76..0000000000 --- a/.github/workflows/django_tests_against_emulator12.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests12 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: aggregation_regress annotations auth_tests backends basic bulk_create cache choices constraints diff --git a/.github/workflows/django_tests_against_emulator13.yml b/.github/workflows/django_tests_against_emulator13.yml deleted file mode 100644 index 81c769aa4f..0000000000 --- a/.github/workflows/django_tests_against_emulator13.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests13 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: delete delete_regress distinct_on_fields empty expressions expressions_window field_defaults file_storage file_uploads filtered_relation diff --git a/.github/workflows/django_tests_against_emulator14.yml b/.github/workflows/django_tests_against_emulator14.yml deleted file mode 100644 index 74b91c3f06..0000000000 --- a/.github/workflows/django_tests_against_emulator14.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests14 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: foreign_object forms_tests from_db_value generic_inline_admin generic_relations generic_relations_regress diff --git a/.github/workflows/django_tests_against_emulator15.yml b/.github/workflows/django_tests_against_emulator15.yml deleted file mode 100644 index b1bb1b921e..0000000000 --- a/.github/workflows/django_tests_against_emulator15.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests15 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: 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 diff --git a/.github/workflows/django_tests_against_emulator16.yml b/.github/workflows/django_tests_against_emulator16.yml deleted file mode 100644 index 1868e89efa..0000000000 --- a/.github/workflows/django_tests_against_emulator16.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests16 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: model_formsets model_formsets_regress model_indexes diff --git a/.github/workflows/django_tests_against_emulator17.yml b/.github/workflows/django_tests_against_emulator17.yml deleted file mode 100644 index f310238593..0000000000 --- a/.github/workflows/django_tests_against_emulator17.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests17 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: servers sessions_tests signals diff --git a/.github/workflows/django_tests_against_emulator18.yml b/.github/workflows/django_tests_against_emulator18.yml deleted file mode 100644 index 5f8a0b9dde..0000000000 --- a/.github/workflows/django_tests_against_emulator18.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests18 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: redirects_tests reserved_names reverse_lookup save_delete_hooks schema raw_query contenttypes_tests diff --git a/.github/workflows/django_tests_against_emulator2.yml b/.github/workflows/django_tests_against_emulator2.yml deleted file mode 100644 index 8703d275ed..0000000000 --- a/.github/workflows/django_tests_against_emulator2.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests2 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: migration_test_data_persistence max_lengths migrate_signals migrations select_for_update queries diff --git a/.github/workflows/django_tests_against_emulator3.yml b/.github/workflows/django_tests_against_emulator3.yml deleted file mode 100644 index a7cd8702d0..0000000000 --- a/.github/workflows/django_tests_against_emulator3.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests3 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: sitemaps_tests sites_framework sites_tests string_lookup syndication_tests test_client test_client_regress test_runner test_utils timezones diff --git a/.github/workflows/django_tests_against_emulator4.yml b/.github/workflows/django_tests_against_emulator4.yml deleted file mode 100644 index c0a04f17e5..0000000000 --- a/.github/workflows/django_tests_against_emulator4.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests4 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: admin_inlines admin_ordering aggregation diff --git a/.github/workflows/django_tests_against_emulator5.yml b/.github/workflows/django_tests_against_emulator5.yml deleted file mode 100644 index e5ec591a84..0000000000 --- a/.github/workflows/django_tests_against_emulator5.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests5 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: custom_columns custom_managers custom_methods custom_pk datatypes dates datetimes db_functions defer defer_regress diff --git a/.github/workflows/django_tests_against_emulator6.yml b/.github/workflows/django_tests_against_emulator6.yml deleted file mode 100644 index 1eff8a53c2..0000000000 --- a/.github/workflows/django_tests_against_emulator6.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests6 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: fixtures fixtures_model_package fixtures_regress flatpages_tests force_insert_update diff --git a/.github/workflows/django_tests_against_emulator7.yml b/.github/workflows/django_tests_against_emulator7.yml deleted file mode 100644 index e4ceed9d0d..0000000000 --- a/.github/workflows/django_tests_against_emulator7.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests7 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: generic_views get_earliest_or_latest get_object_or_404 get_or_create i18n indexes inline_formsets inspectdb introspection invalid_models_tests diff --git a/.github/workflows/django_tests_against_emulator8.yml b/.github/workflows/django_tests_against_emulator8.yml deleted file mode 100644 index 4a358f9654..0000000000 --- a/.github/workflows/django_tests_against_emulator8.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests8 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: model_inheritance model_inheritance_regress model_options model_package multiple_database diff --git a/.github/workflows/django_tests_against_emulator9.yml b/.github/workflows/django_tests_against_emulator9.yml deleted file mode 100644 index a00006f932..0000000000 --- a/.github/workflows/django_tests_against_emulator9.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - push: - branches: - - master - pull_request: -name: django-tests9 -jobs: - system-tests: - runs-on: ubuntu-latest - - services: - emulator-0: - image: gcr.io/cloud-spanner-emulator/emulator:latest - ports: - - 9010:9010 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Run Django tests - run: sh django_test_suite.sh - env: - SPANNER_EMULATOR_HOST: localhost:9010 - GOOGLE_CLOUD_PROJECT: emulator-test-project - GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true - RUNNING_SPANNER_BACKEND_TESTS: 1 - SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests - DJANGO_TEST_APPS: prefetch_related proxy_model_inheritance diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 09323d7da1..e49610a0ae 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +set -x set -eo pipefail cd github/python-spanner-django @@ -54,8 +55,10 @@ export RUNNING_SPANNER_BACKEND_TESTS=1 # Python and other dynamic languages. export USE_SPANNER_EMULATOR=0 +echo "does this install fail?" +echo `pwd` +echo `ls -lah` pip3 install . -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" diff --git a/django_test_suite.sh b/django_test_suite.sh index fea10501e9..c65561f443 100755 --- a/django_test_suite.sh +++ b/django_test_suite.sh @@ -1,10 +1,10 @@ -#!/bin/sh +#!/bin/bash # Copyright (c) 2020 Google LLC. All rights reserved. # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. -set -x pipefail +set -x sudo apt-get update -y sudo apt-get install -y libmemcached-dev @@ -18,7 +18,6 @@ mkdir -p $DJANGO_TESTS_DIR if [ $SPANNER_EMULATOR_HOST != 0 ] then pip3 install . - pip3 install -e 'git+https://github.com/q-logic/python-spanner-django.git@dj_tests_against_emulator#egg=django-google-spanner' git clone --depth 1 --single-branch --branch spanner-2.2.x https://github.com/timgraham/django.git $DJANGO_TESTS_DIR/django fi @@ -70,4 +69,4 @@ PASSWORD_HASHERS = [ cd $TESTS_DIR/django/tests create_settings -python3 runtests.py $TEST_APPS --verbosity=3 --noinput --settings $SETTINGS_FILE \ No newline at end of file +python3 runtests.py $TEST_APPS --verbosity=3 --noinput --settings $SETTINGS_FILE