From 6fc5b26ef13e3f683de0b8aabec193e59932d5fe Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Fri, 21 Feb 2025 07:32:16 +0100
Subject: [PATCH] WIP

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
 .gitlab-ci.yml                         |  6 +++---
 dbrepo-analyse-service/.coveragerc     | 10 ++++++++++
 dbrepo-auth-service/init/.coveragerc   | 10 ++++++++--
 dbrepo-search-service/.coveragerc      |  2 +-
 dbrepo-search-service/init/.coveragerc |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 dbrepo-analyse-service/.coveragerc

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90f8d02881..502cd67b02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -304,7 +304,7 @@ test-analyse-service:
   script:
     - "pip install pipenv"
     - "pipenv install gunicorn && pipenv install --dev --system --deploy"
-    - cd ./dbrepo-analyse-service/ && coverage run -m pytest tests/test_determine_dt.py tests/test_determine_pk.py tests/test_s3_client.py && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
+    - cd ./dbrepo-analyse-service/ && coverage run --rcfile=.coveragerc -m pytest tests/test_determine_dt.py tests/test_determine_pk.py tests/test_s3_client.py && coverage html && coverage report > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
@@ -326,7 +326,7 @@ test-auth-service-init:
     - "pip install pipenv"
     - "pipenv install gunicorn && pipenv install --dev --system --deploy"
   script:
-    - cd ./dbrepo-auth-service/init/ && coverage run -m pytest tests/test_unit_app.py && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
+    - cd ./dbrepo-auth-service/init/ && coverage run --rcfile=.coveragerc -m pytest tests/test_unit_app.py && coverage html && coverage report > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
@@ -405,7 +405,7 @@ test-lib:
   script:
     - "pip install pipenv"
     - "pipenv install gunicorn && pipenv install --dev --system --deploy"
-    - cd ./lib/python/ && coverage run -rcfile=.coveragerc -m pytest tests/test_unit_container.py tests/test_unit_concept.py tests/test_unit_database.py tests/test_unit_identifier.py tests/test_unit_license.py tests/test_unit_query.py tests/test_unit_rest_client.py tests/test_unit_table.py tests/test_unit_user.py tests/test_unit_view.py tests/test_unit_unit.py && coverage html && coverage report > ./coverage.txt
+    - cd ./lib/python/ && coverage run --rcfile=.coveragerc -m pytest tests/test_unit_container.py tests/test_unit_concept.py tests/test_unit_database.py tests/test_unit_identifier.py tests/test_unit_license.py tests/test_unit_query.py tests/test_unit_rest_client.py tests/test_unit_table.py tests/test_unit_user.py tests/test_unit_view.py tests/test_unit_unit.py && coverage html && coverage report > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
diff --git a/dbrepo-analyse-service/.coveragerc b/dbrepo-analyse-service/.coveragerc
new file mode 100644
index 0000000000..35271a237a
--- /dev/null
+++ b/dbrepo-analyse-service/.coveragerc
@@ -0,0 +1,10 @@
+[report]
+format = text
+omit =
+    # omit tests
+    ./tests/*
+    # omit ext lib
+    ./omlib/*
+
+[html]
+directory = htmlcov
\ No newline at end of file
diff --git a/dbrepo-auth-service/init/.coveragerc b/dbrepo-auth-service/init/.coveragerc
index 5951051c8d..35271a237a 100644
--- a/dbrepo-auth-service/init/.coveragerc
+++ b/dbrepo-auth-service/init/.coveragerc
@@ -1,4 +1,10 @@
 [report]
+format = text
+omit =
+    # omit tests
+    ./tests/*
+    # omit ext lib
+    ./omlib/*
 
-exclude_lines =
-    if __name__ == .__main__.:
\ No newline at end of file
+[html]
+directory = htmlcov
\ No newline at end of file
diff --git a/dbrepo-search-service/.coveragerc b/dbrepo-search-service/.coveragerc
index fe5a089d2e..35271a237a 100644
--- a/dbrepo-search-service/.coveragerc
+++ b/dbrepo-search-service/.coveragerc
@@ -1,5 +1,5 @@
 [report]
-format = html
+format = text
 omit =
     # omit tests
     ./tests/*
diff --git a/dbrepo-search-service/init/.coveragerc b/dbrepo-search-service/init/.coveragerc
index fe5a089d2e..35271a237a 100644
--- a/dbrepo-search-service/init/.coveragerc
+++ b/dbrepo-search-service/init/.coveragerc
@@ -1,5 +1,5 @@
 [report]
-format = html
+format = text
 omit =
     # omit tests
     ./tests/*
-- 
GitLab