From 8cd4a44d025201e14c6a9f73c3d73bb4d2021644 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Sat, 12 Jun 2021 13:46:21 +0200 Subject: [PATCH] Simplify definition of DAV_SERVERs --- .builds/archlinux.yaml | 6 +++--- .builds/tests-minimal.yaml | 6 +++--- .builds/tests-release.yaml | 7 +++---- Makefile | 5 ++++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.builds/archlinux.yaml b/.builds/archlinux.yaml index 77dd24c..e9b9740 100644 --- a/.builds/archlinux.yaml +++ b/.builds/archlinux.yaml @@ -24,6 +24,7 @@ environment: BUILD: test CI: true CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79 + DAV_SERVER: radicale xandikos REQUIREMENTS: release # TODO: ETESYNC_TESTS tasks: @@ -32,11 +33,10 @@ tasks: python setup.py build sudo pip install --no-index . sudo systemctl start docker - DAV_SERVER="radicale xandikos" make -e install-servers + make -e install-servers - test: | cd vdirsyncer # Non-system python is used for packages: export PATH=$PATH:~/.local/bin/ make -e ci-test - DAV_SERVER=radicale make -e ci-test-storage - DAV_SERVER=xandikos make -e ci-test-storage + make -e ci-test-storage diff --git a/.builds/tests-minimal.yaml b/.builds/tests-minimal.yaml index 7c54770..004ed9e 100644 --- a/.builds/tests-minimal.yaml +++ b/.builds/tests-minimal.yaml @@ -14,17 +14,17 @@ environment: BUILD: test CI: true CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79 + DAV_SERVER: radicale xandikos REQUIREMENTS: minimal # TODO: ETESYNC_TESTS tasks: - setup: | cd vdirsyncer sudo systemctl start docker - DAV_SERVER="radicale xandikos" make -e install-test + make -e install-test - test: | cd vdirsyncer # Non-system python is used for packages: export PATH=$PATH:~/.local/bin/ make -e ci-test - DAV_SERVER=radicale make -e ci-test-storage - DAV_SERVER=xandikos make -e ci-test-storage + make -e ci-test-storage diff --git a/.builds/tests-release.yaml b/.builds/tests-release.yaml index 5e7fa05..380b45a 100644 --- a/.builds/tests-release.yaml +++ b/.builds/tests-release.yaml @@ -11,22 +11,21 @@ environment: BUILD: test CI: true CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79 + DAV_SERVER: baikal radicale xandikos REQUIREMENTS: release # TODO: ETESYNC_TESTS tasks: - setup: | cd vdirsyncer sudo systemctl start docker - DAV_SERVER="radicale xandikos baikal" make -e install-test + make -e install-test make -e install-style - test: | cd vdirsyncer # Non-system python is used for packages: export PATH=$PATH:~/.local/bin/ make -e ci-test - DAV_SERVER=baikal make -e ci-test-storage - DAV_SERVER=radicale make -e ci-test-storage - DAV_SERVER=xandikos make -e ci-test-storage + make -e ci-test-storage - style: | cd vdirsyncer # Non-system python is used for packages: diff --git a/Makefile b/Makefile index 295631d..159e4b1 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,10 @@ ci-test: ci-test-storage: curl -s https://codecov.io/bash > $(CODECOV_PATH) - $(PYTEST) tests/storage/ + set -ex; \ + for server in $(DAV_SERVER); do \ + DAV_SERVER=$$server $(PYTEST) --cov-append tests/storage; \ + done bash $(CODECOV_PATH) -c -F storage test: