Use codecov tags

This commit is contained in:
Markus Unterwaditzer 2017-03-22 15:58:05 +01:00
parent 5a508ae327
commit 461fab84ec
4 changed files with 17 additions and 22 deletions

View file

@ -2,3 +2,10 @@ comment: false
coverage:
status:
patch: false
project:
unit:
flags: unit
system:
flags: system
storage:
flags: storage

View file

@ -1,7 +1,4 @@
{
"after_script": [
"\nif [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ] || [ \"$BUILD_PRS\" != \"false\" ];\nthen make -e after-$BUILD;\nfi"
],
"branches": {
"only": [
"auto",

View file

@ -18,13 +18,17 @@ endif
ifeq ($(CI), true)
TEST_EXTRA_PACKAGES += codecov
endif
ifneq ($(DAV_SERVER), skip)
PYTEST_ARGS += tests/storage/dav
endif
ifneq ($(REMOTESTORAGE_SERVER), skip)
PYTEST_ARGS += tests/storage/test_remotestorage.py
test:
py.test $(PYTEST_ARGS) tests/unit/
codecov -F unit
py.test $(PYTEST_ARGS) tests/system/
codecov -F system
py.test $(PYTEST_ARGS) tests/storage/
codecov -F storage
else
test:
py.test $(PYTEST_ARGS)
endif
all:
@ -49,12 +53,6 @@ install-test: install-servers
fi
[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
test:
py.test $(PYTEST_ARGS)
after-test:
[ "$(CI)" != "true" ] || codecov
install-style: install-docs
pip install flake8 flake8-import-order flake8-bugbear>=17.3.0
@ -65,9 +63,6 @@ style:
sphinx-build -W -b html ./docs/ ./docs/_build/html/
python3 scripts/make_travisconf.py | diff -b .travis.yml -
after-style:
true
travis-conf:
python3 scripts/make_travisconf.py > .travis.yml
@ -77,9 +72,6 @@ install-docs:
docs:
cd docs && make html
after-docs:
true
sh: # open subshell with default test config
$$SHELL;

View file

@ -32,7 +32,6 @@ then {};
fi""".format
cfg['script'] = [script("make -e $BUILD")]
cfg['after_script'] = [script("make -e after-$BUILD")]
matrix = []
cfg['matrix'] = {'include': matrix}