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 tests multiple times (#556)

Browse source 
Fix #554
This commit is contained in:
Markus Unterwaditzer 2017-02-15 20:30:00 +01:00 committed by GitHub
parent 558ea3923a
commit 8d10046fc8
3 changed files with 87 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
.travis.yml
View file

@ -18,103 +18,151 @@
"matrix": { "matrix": {
"include": [ "include": [
{ {
"env": "BUILD=style BUILD_PRS=true", "env": "BUILD=style",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=devel ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=release ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=minimal ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.3"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.3"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.3"
},
{
"env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=devel ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=release ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=minimal ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.4"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.4"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.4"
},
{
"env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=devel ",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=release ",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=minimal ",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.5"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.5"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.5"
},
{
"env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=devel ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true", "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=minimal ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal ",
"python": "3.6"
},
{
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel ",
"python": "3.6"
},
{
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release ",
"python": "3.6"
},
{
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal ",
"python": "3.6" "python": "3.6"
}, },
{ {

12
Makefile
View file

@ -9,6 +9,14 @@ export CI := false
export COVERAGE := $(CI) export COVERAGE := $(CI)
export DETERMINISTIC_TESTS := false export DETERMINISTIC_TESTS := false
PYTEST_ARGS =
ifneq ($(DAV_SERVER), skip)
PYTEST_ARGS += tests/storage/dav
endif
ifneq ($(REMOTESTORAGE_SERVER), skip)
PYTEST_ARGS += tests/storage/test_remotestorage.py
endif
all: all:
$(error Take a look at https://vdirsyncer.pimutils.org/en/stable/tutorial.html#installation) $(error Take a look at https://vdirsyncer.pimutils.org/en/stable/tutorial.html#installation)
@ -34,9 +42,9 @@ install-test: install-servers
test: test:
set -e; \ set -e; \
if [ "$(COVERAGE)" = "true" ]; then \ if [ "$(COVERAGE)" = "true" ]; then \
py.test --cov-config .coveragerc --cov vdirsyncer; \ py.test --cov-config .coveragerc --cov vdirsyncer $(PYTEST_ARGS); \
else \ else \
py.test; \ py.test $(PYTEST_ARGS); \
fi fi
after-test: after-test:

16
scripts/make_travisconf.py
View file

@ -34,17 +34,17 @@ cfg['matrix'] = {'include': matrix}
matrix.append({ matrix.append({
'python': latest_python, 'python': latest_python,
'env': 'BUILD=style BUILD_PRS=true' 'env': 'BUILD=style'
}) })
for python in python_versions: for python in python_versions:
if python == latest_python: if python == latest_python:
dav_servers = ("radicale", "owncloud", "nextcloud", "baikal", dav_servers = ("skip", "radicale", "owncloud", "nextcloud", "baikal",
"davical") "davical")
rs_servers = () rs_servers = ()
else: else:
dav_servers = ("radicale",) dav_servers = ("skip", "radicale")
rs_servers = () rs_servers = ()
for (server_type, server), requirements in itertools.product( for (server_type, server), requirements in itertools.product(
@ -54,22 +54,14 @@ for python in python_versions:
), ),
("devel", "release", "minimal") ("devel", "release", "minimal")
): ):
build_prs = (
python == latest_python and
server_type == 'DAV' and
server == 'radicale'
)
matrix.append({ matrix.append({
'python': python, 'python': python,
'env': ("BUILD=test " 'env': ("BUILD=test "
"{server_type}_SERVER={server} " "{server_type}_SERVER={server} "
"REQUIREMENTS={requirements} " "REQUIREMENTS={requirements} "
"BUILD_PRS={build_prs}"
.format(server_type=server_type, .format(server_type=server_type,
server=server, server=server,
requirements=requirements, requirements=requirements))
build_prs='true' if build_prs else 'false'))
}) })
matrix.append({ matrix.append({