diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a15eddcc5..27fa50698 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -70,10 +70,10 @@ jobs: run: make all compress - name: Run tests working-directory: ./src - run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100 + run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100 - name: Run concurrency tests working-directory: ./src - run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reruns 0 --reuse-db + run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reruns 0 --reuse-db if: matrix.database == 'postgres' - name: Upload coverage uses: codecov/codecov-action@v1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9d4ef9f5..487eec308 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ tests: - cd src - python manage.py check - make all compress - - PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg py.test --reruns 3 -n 3 tests --maxfail=100 + - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test --reruns 3 -n 3 tests --maxfail=100 except: - pypi pypi: diff --git a/src/tests/travis_postgres.cfg b/src/tests/ci_postgres.cfg similarity index 100% rename from src/tests/travis_postgres.cfg rename to src/tests/ci_postgres.cfg diff --git a/src/tests/travis_sqlite.cfg b/src/tests/ci_sqlite.cfg similarity index 100% rename from src/tests/travis_sqlite.cfg rename to src/tests/ci_sqlite.cfg