From 461fab84ec624eb3553f82d2a0393b35421d5607 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 22 Mar 2017 15:58:05 +0100
Subject: [PATCH] Use codecov tags

---
 .codecov.yml               |  7 +++++++
 .travis.yml                |  3 ---
 Makefile                   | 28 ++++++++++------------------
 scripts/make_travisconf.py |  1 -
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.codecov.yml b/.codecov.yml
index b5f7ec4..0ff3feb 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -2,3 +2,10 @@ comment: false
 coverage:
   status:
     patch: false
+    project:
+      unit:
+        flags: unit
+      system:
+        flags: system
+      storage:
+        flags: storage
diff --git a/.travis.yml b/.travis.yml
index 87a298c..b0f2046 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
 {
-  "after_script": [
-    "\nif [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ] || [ \"$BUILD_PRS\" != \"false\" ];\nthen make -e after-$BUILD;\nfi"
-  ],
   "branches": {
     "only": [
       "auto",
diff --git a/Makefile b/Makefile
index b46fd54..00b7dde 100644
--- a/Makefile
+++ b/Makefile
@@ -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;
 
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 34a0e7a..4e97bb8 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -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}