From 58aa0a3a31e82d1319eced1182b4021dc3d400bb Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Sat, 26 Jun 2021 16:03:00 +0200
Subject: [PATCH] Simplify coverage submission

We submit separate coverage reports for each group of tests, but codecov
doesn't give us proper tooling to analyse each one separately. When
there's a percentage drop in one, there's no way to pinpoint where -- at
least not without running locally and inspecting results separately.

Treat all coverage as one. Analysis of coverage for each group of tests
can be done offline and manually, but there's little value in keeping it
in codecov.

Should also help us transition a more simplified CI design (e.g.:
running all tests together rather than in groups).
---
 .codecov.yml | 7 -------
 Makefile     | 8 +++-----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.codecov.yml b/.codecov.yml
index 0ff3feb..b5f7ec4 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -2,10 +2,3 @@ comment: false
 coverage:
   status:
     patch: false
-    project:
-      unit:
-        flags: unit
-      system:
-        flags: system
-      storage:
-        flags: storage
diff --git a/Makefile b/Makefile
index 632d319..092d7da 100644
--- a/Makefile
+++ b/Makefile
@@ -43,10 +43,8 @@ all:
 
 ci-test:
 	curl -s https://codecov.io/bash > $(CODECOV_PATH)
-	$(PYTEST) tests/unit/
-	bash $(CODECOV_PATH) -c -F unit
-	$(PYTEST) tests/system/
-	bash $(CODECOV_PATH) -c -F system
+	$(PYTEST) --cov-append tests/unit/ tests/system/
+	bash $(CODECOV_PATH) -c
 	[ "$(ETESYNC_TESTS)" = "false" ] || make test-storage
 
 ci-test-storage:
@@ -55,7 +53,7 @@ ci-test-storage:
 	for server in $(DAV_SERVER); do \
 		DAV_SERVER=$$server $(PYTEST) --cov-append tests/storage; \
 	done
-	bash $(CODECOV_PATH) -c -F storage
+	bash $(CODECOV_PATH) -c
 
 test:
 	$(PYTEST)