From 68533ce0b6bebc56bdd55dce51d423e758f00847 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 14 Oct 2024 09:06:42 +0200
Subject: [PATCH] WIP
---
.gitlab-ci.yml | 4 ++--
dbrepo-search-service/.coveragerc | 4 ++++
lib/python/.coveragerc | 3 +++
lib/python/.gitignore | 1 +
lib/python/test.sh | 2 +-
lib/python/tests/test_unit_container.py | 2 +-
lib/python/tests/test_unit_database.py | 2 +-
7 files changed, 13 insertions(+), 5 deletions(-)
create mode 100644 dbrepo-search-service/.coveragerc
create mode 100644 lib/python/.coveragerc
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f15ae86182..8036b23a85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -263,7 +263,7 @@ test-search-service:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_opensearch_client.py --junitxml=report.xml && coverage html --omit="test/*,omlib/*" && coverage report --omit="test/*,omlib/*" > ./coverage.txt
+ - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_opensearch_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
@@ -287,7 +287,7 @@ test-search-service-init:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./dbrepo-search-service/ && coverage run -m pytest ./init/test/test_app.py --junitxml=report.xml && coverage html --omit="init/test/*" && coverage report --omit="init/test/*" > ./coverage.txt
+ - cd ./dbrepo-search-service/ && coverage run -m pytest ./init/test/test_app.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
diff --git a/dbrepo-search-service/.coveragerc b/dbrepo-search-service/.coveragerc
new file mode 100644
index 0000000000..97830be8d6
--- /dev/null
+++ b/dbrepo-search-service/.coveragerc
@@ -0,0 +1,4 @@
+[report]
+omit =
+ */test/*
+ */omlib/*
\ No newline at end of file
diff --git a/lib/python/.coveragerc b/lib/python/.coveragerc
new file mode 100644
index 0000000000..2301243c84
--- /dev/null
+++ b/lib/python/.coveragerc
@@ -0,0 +1,3 @@
+[report]
+omit =
+ */tests/*
diff --git a/lib/python/.gitignore b/lib/python/.gitignore
index 46916e3e91..c954a77400 100644
--- a/lib/python/.gitignore
+++ b/lib/python/.gitignore
@@ -5,6 +5,7 @@
dist/
dbrepo.egg-info/
build/
+htmlcov/
# debug
debug.py
diff --git a/lib/python/test.sh b/lib/python/test.sh
index 532d9a58d1..cd0129654a 100644
--- a/lib/python/test.sh
+++ b/lib/python/test.sh
@@ -1,3 +1,3 @@
#!/bin/bash
source ./lib/python/venv/bin/activate
-cd ./lib/python/ && coverage run -m pytest tests/*.py --junitxml=report.xml && coverage html --omit="test/*" && coverage report --omit="test/*" > ./coverage.txt
\ No newline at end of file
+cd ./lib/python/ && coverage run -m pytest tests/*.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
\ No newline at end of file
diff --git a/lib/python/tests/test_unit_container.py b/lib/python/tests/test_unit_container.py
index 94d18b79fd..0e1d93faa0 100644
--- a/lib/python/tests/test_unit_container.py
+++ b/lib/python/tests/test_unit_container.py
@@ -4,7 +4,7 @@ import requests_mock
import datetime
from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import Container, Image, ContainerBrief, ImageBrief
+from dbrepo.api.dto import Container, Image, ContainerBrief, ImageBrief, DataType
from dbrepo.api.exceptions import ResponseCodeError, NotExistsError
diff --git a/lib/python/tests/test_unit_database.py b/lib/python/tests/test_unit_database.py
index e7cefa6d5b..f72c80c93c 100644
--- a/lib/python/tests/test_unit_database.py
+++ b/lib/python/tests/test_unit_database.py
@@ -7,7 +7,7 @@ from pydantic_core import ValidationError
from dbrepo.RestClient import RestClient
from dbrepo.api.dto import Database, User, Container, Image, UserAttributes, DatabaseAccess, AccessType, DatabaseBrief, \
- UserBrief
+ UserBrief, DataType
from dbrepo.api.exceptions import ResponseCodeError, NotExistsError, ForbiddenError, MalformedError, AuthenticationError
--
GitLab