sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't run unit/system tests for each storage

Browse source 
The current storage (DAV_SERVER) has no impact on unit tests and system
tests, so rather than run all these tests for each server, just run them
once per python.
This commit is contained in:
Hugo Osvaldo Barrera 2020-06-08 22:39:26 +02:00
parent 6c6da2f613
commit 0319035688
3 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
.travis.yml
View file

@ -25,40 +25,56 @@
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ", "env": "BUILD=test REQUIREMENTS=release",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release ", "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ", "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal ", "env": "BUILD=test REQUIREMENTS=minimal",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ", "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.5"
},
{
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
"python": "3.5"
},
{
"env": "BUILD=test REQUIREMENTS=release",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release ", "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=fastmail REQUIREMENTS=release ", "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
"python": "3.6"
},
{
"env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ",
"if": "NOT (type IN (pull_request))", "if": "NOT (type IN (pull_request))",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ", "env": "BUILD=test REQUIREMENTS=minimal",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal ", "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.6"
},
{
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
"python": "3.6" "python": "3.6"
}, },
{ {

10
Makefile
View file

@ -46,14 +46,16 @@ export TESTSERVER_BASE := ./tests/storage/servers/
CODECOV_PATH = /tmp/codecov.sh CODECOV_PATH = /tmp/codecov.sh
ifeq ($(CI), true) ifeq ($(CI), true)
test-storage:
curl -s https://codecov.io/bash > $(CODECOV_PATH)
$(PYTEST) tests/storage/
bash $(CODECOV_PATH) -c -F storage
test: test:
curl -s https://codecov.io/bash > $(CODECOV_PATH) curl -s https://codecov.io/bash > $(CODECOV_PATH)
$(PYTEST) tests/unit/ $(PYTEST) tests/unit/
bash $(CODECOV_PATH) -c -F unit bash $(CODECOV_PATH) -c -F unit
$(PYTEST) tests/system/ $(PYTEST) tests/system/
bash $(CODECOV_PATH) -c -F system bash $(CODECOV_PATH) -c -F system
$(PYTEST) tests/storage/
bash $(CODECOV_PATH) -c -F storage
else else
test: test:
$(PYTEST) $(PYTEST)
@ -81,6 +83,10 @@ install-test: install-servers install-dev
fi fi
[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES) [ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
install-test-storage: install-test
# This is just an alias
true
install-style: install-docs install-dev install-style: install-docs install-dev
pip install -U flake8 flake8-import-order flake8-bugbear pip install -U flake8 flake8-import-order flake8-bugbear

7
scripts/make_travisconf.py
View file

@ -45,13 +45,18 @@ for python, requirements in itertools.product(
): ):
dav_servers = ("radicale", "xandikos") dav_servers = ("radicale", "xandikos")
matrix.append({
'python': python,
'env': f"BUILD=test REQUIREMENTS={requirements}",
})
if python == latest_python and requirements == "release": if python == latest_python and requirements == "release":
dav_servers += ("fastmail",) dav_servers += ("fastmail",)
for dav_server in dav_servers: for dav_server in dav_servers:
job = { job = {
'python': python, 'python': python,
'env': ("BUILD=test " 'env': ("BUILD=test-storage "
"DAV_SERVER={dav_server} " "DAV_SERVER={dav_server} "
"REQUIREMENTS={requirements} " "REQUIREMENTS={requirements} "
.format(dav_server=dav_server, .format(dav_server=dav_server,