From 58c386c556256a54f413cf121c077e4c5e50950e Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 17 Feb 2025 19:45:49 +0100
Subject: [PATCH] WIP

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
 .gitlab-ci.yml                                  |  16 ++++++++--------
 .../init/{test => tests}/conftest.py            |   0
 .../init/{test => tests}/rsa/rs256.key          |   0
 .../init/{test => tests}/rsa/rsa/rs256.key      |   0
 .../init/{test => tests}/rsa/rsa/rsa256.pkey    |   0
 .../init/{test => tests}/rsa/rsa256.pkey        |   0
 .../init/{test => tests}/test_app.py            |   0
 .../{test => tests}/test_keycloak_client.py     |   0
 .../{test => tests}/test_opensearch_client.py   |   0
 .../{test => tests}/.testpickle                 | Bin
 .../{test => tests}/__init__.py                 |   0
 .../{test => tests}/conftest.py                 |   0
 dbrepo-search-service/tests/rsa/rsa/rs256.key   |   3 +++
 dbrepo-search-service/tests/rsa/rsa/rsa256.pkey |   3 +++
 .../{test => tests}/test_app.py                 |   0
 .../{test => tests}/test_jwt.py                 |   0
 dbrepo-ui/{test => tests}/test_heap.sh          |   0
 17 files changed, 14 insertions(+), 8 deletions(-)
 rename dbrepo-search-service/init/{test => tests}/conftest.py (100%)
 rename dbrepo-search-service/init/{test => tests}/rsa/rs256.key (100%)
 rename dbrepo-search-service/init/{test => tests}/rsa/rsa/rs256.key (100%)
 rename dbrepo-search-service/init/{test => tests}/rsa/rsa/rsa256.pkey (100%)
 rename dbrepo-search-service/init/{test => tests}/rsa/rsa256.pkey (100%)
 rename dbrepo-search-service/init/{test => tests}/test_app.py (100%)
 rename dbrepo-search-service/init/{test => tests}/test_keycloak_client.py (100%)
 rename dbrepo-search-service/init/{test => tests}/test_opensearch_client.py (100%)
 rename dbrepo-search-service/{test => tests}/.testpickle (100%)
 rename dbrepo-search-service/{test => tests}/__init__.py (100%)
 rename dbrepo-search-service/{test => tests}/conftest.py (100%)
 create mode 100644 dbrepo-search-service/tests/rsa/rsa/rs256.key
 create mode 100644 dbrepo-search-service/tests/rsa/rsa/rsa256.pkey
 rename dbrepo-search-service/{test => tests}/test_app.py (100%)
 rename dbrepo-search-service/{test => tests}/test_jwt.py (100%)
 rename dbrepo-ui/{test => tests}/test_heap.sh (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 061afb1a9a..727af46cb1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -302,7 +302,7 @@ test-analyse-service:
   script:
     - "pip install pipenv"
     - "pipenv install gunicorn && pipenv install --dev --system --deploy"
-    - cd ./dbrepo-analyse-service/ && coverage run -m pytest test/test_determine_dt.py test/test_determine_pk.py test/test_s3_client.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
+    - cd ./dbrepo-analyse-service/ && coverage run -m pytest tests/test_determine_dt.py tests/test_determine_pk.py tests/test_s3_client.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
@@ -324,7 +324,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 test/test_unit_app.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
+    - cd ./dbrepo-auth-service/init/ && coverage run -m pytest tests/test_unit_app.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
@@ -348,14 +348,14 @@ test-search-service:
   before_script:
     - "cp -r ./dbrepo-search-service/init/clients ./dbrepo-search-service/clients"
     - "cp -r ./dbrepo-search-service/init/omlib ./dbrepo-search-service/omlib"
-    - "cp -r ./dbrepo-search-service/init/test/rsa ./dbrepo-search-service/test/rsa"
-    - "cp ./dbrepo-search-service/init/test/test_keycloak_client.py ./dbrepo-search-service/test"
-    - "cp ./dbrepo-search-service/init/test/test_opensearch_client.py ./dbrepo-search-service/test"
+    - "cp -r ./dbrepo-search-service/init/tests/rsa ./dbrepo-search-service/tests/rsa"
+    - "cp ./dbrepo-search-service/init/tests/test_keycloak_client.py ./dbrepo-search-service/test"
+    - "cp ./dbrepo-search-service/init/tests/test_opensearch_client.py ./dbrepo-search-service/test"
     - "cp ./dbrepo-search-service/init/friendly_names_overrides.json ./dbrepo-search-service/friendly_names_overrides.json"
   script:
     - "pip install pipenv"
     - "pipenv install gunicorn && pipenv install --dev --system --deploy"
-    - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_app.py test/test_jwt.py test/test_opensearch_client.py test/test_keycloak_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
+    - cd ./dbrepo-search-service/ && coverage run -m pytest tests/test_app.py tests/test_jwt.py tests/test_opensearch_client.py tests/test_keycloak_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
@@ -379,7 +379,7 @@ test-search-service-init:
   script:
     - "pip install pipenv"
     - "pipenv install gunicorn && pipenv install --dev --system --deploy"
-    - cd ./dbrepo-search-service/init/ && coverage run -m pytest test/test_app.py test/test_keycloak_client.py test/test_opensearch_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
+    - cd ./dbrepo-search-service/init/ && coverage run -m pytest tests/test_app.py tests/test_keycloak_client.py tests/test_opensearch_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
@@ -428,7 +428,7 @@ test-ui:
     - "docker run --name dbrepo-ui -e NODE_OPTIONS='--max_old_space_size=256' -p 3000:3000 -d dbrepo-ui:latest"
   script:
     - "sleep 30"
-    - "ENDPOINT=http://localhost:3000 bash ./dbrepo-ui/test/test_heap.sh"
+    - "ENDPOINT=http://localhost:3000 bash ./dbrepo-ui/tests/test_heap.sh"
 
 release-images:
   stage: release
diff --git a/dbrepo-search-service/init/test/conftest.py b/dbrepo-search-service/init/tests/conftest.py
similarity index 100%
rename from dbrepo-search-service/init/test/conftest.py
rename to dbrepo-search-service/init/tests/conftest.py
diff --git a/dbrepo-search-service/init/test/rsa/rs256.key b/dbrepo-search-service/init/tests/rsa/rs256.key
similarity index 100%
rename from dbrepo-search-service/init/test/rsa/rs256.key
rename to dbrepo-search-service/init/tests/rsa/rs256.key
diff --git a/dbrepo-search-service/init/test/rsa/rsa/rs256.key b/dbrepo-search-service/init/tests/rsa/rsa/rs256.key
similarity index 100%
rename from dbrepo-search-service/init/test/rsa/rsa/rs256.key
rename to dbrepo-search-service/init/tests/rsa/rsa/rs256.key
diff --git a/dbrepo-search-service/init/test/rsa/rsa/rsa256.pkey b/dbrepo-search-service/init/tests/rsa/rsa/rsa256.pkey
similarity index 100%
rename from dbrepo-search-service/init/test/rsa/rsa/rsa256.pkey
rename to dbrepo-search-service/init/tests/rsa/rsa/rsa256.pkey
diff --git a/dbrepo-search-service/init/test/rsa/rsa256.pkey b/dbrepo-search-service/init/tests/rsa/rsa256.pkey
similarity index 100%
rename from dbrepo-search-service/init/test/rsa/rsa256.pkey
rename to dbrepo-search-service/init/tests/rsa/rsa256.pkey
diff --git a/dbrepo-search-service/init/test/test_app.py b/dbrepo-search-service/init/tests/test_app.py
similarity index 100%
rename from dbrepo-search-service/init/test/test_app.py
rename to dbrepo-search-service/init/tests/test_app.py
diff --git a/dbrepo-search-service/init/test/test_keycloak_client.py b/dbrepo-search-service/init/tests/test_keycloak_client.py
similarity index 100%
rename from dbrepo-search-service/init/test/test_keycloak_client.py
rename to dbrepo-search-service/init/tests/test_keycloak_client.py
diff --git a/dbrepo-search-service/init/test/test_opensearch_client.py b/dbrepo-search-service/init/tests/test_opensearch_client.py
similarity index 100%
rename from dbrepo-search-service/init/test/test_opensearch_client.py
rename to dbrepo-search-service/init/tests/test_opensearch_client.py
diff --git a/dbrepo-search-service/test/.testpickle b/dbrepo-search-service/tests/.testpickle
similarity index 100%
rename from dbrepo-search-service/test/.testpickle
rename to dbrepo-search-service/tests/.testpickle
diff --git a/dbrepo-search-service/test/__init__.py b/dbrepo-search-service/tests/__init__.py
similarity index 100%
rename from dbrepo-search-service/test/__init__.py
rename to dbrepo-search-service/tests/__init__.py
diff --git a/dbrepo-search-service/test/conftest.py b/dbrepo-search-service/tests/conftest.py
similarity index 100%
rename from dbrepo-search-service/test/conftest.py
rename to dbrepo-search-service/tests/conftest.py
diff --git a/dbrepo-search-service/tests/rsa/rsa/rs256.key b/dbrepo-search-service/tests/rsa/rsa/rs256.key
new file mode 100644
index 0000000000..86b3eaf5c6
--- /dev/null
+++ b/dbrepo-search-service/tests/rsa/rsa/rs256.key
@@ -0,0 +1,3 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQABAoIBADNcMt6hAHub4JTAYS6Mra0EPRBO2XhWmACBrv3+8ETClXd5475KPLDewgRVtlmtbwU8G8awUXESQgPS9lfiqvQhPreA3cHlm6oP2WMKOEtakr2s8I+frsTBLCo0Ini9RaSzjoVVgS0zofyhASKi+T970MafSj5P3XNb8YBFdXgoYDiA7FXLH6a/+m7LScL+wGcFMAAeYESxZbMQLfH3v8L+4EcTraiwjLG17ZdlF3dpybMyUSse6ZQ/PdlyvBuzzLXhN6Ce2gd9ATfS+YWTzo7Yf+GU+ex5bIpVOfHqtuM/hyq7YGKENClsXwNZIAoFnvGCbvECAfgyapVrD30IfykCgYEA0rgsSZ82pxT40NxwgBD1g9lbNVBKXphRB/3S078qusUzJjT7AldEj4imGPhAbI7bI8gAeWJsp1XJWkjM8ktaVrh+NQl7p8e9OPh0pQF/5Bdg8ajbjXESpjnaU66pVYRQy/d+jNli/YRAHX5RUfsBl+6W4+WSVMGmKBiqJsur+ecCgYEAz1YVXClcmUnyZem5B+2E9noIzjF6ROE+jIb6rawM85P3Xd0lXtECQavtxw+Qk7I32qOwrxl1UpK2foVel3pazi+4OpMfmqtYGenRP1Zk1cZwrDo0cIemTDGjj3kJ8tYn12CGolFQpJZgK6OHzvG0tOxI5VZgjIViWNPe1PGWXtUCgYEAxXGNDe8BZs1f11S2lUlOw5yGug3hoYFXbAWJ5p7Ziuf8ZXB/QlJDC7se54a11wKEk6Jzz0lKRgE8CjzszJuOqnN0zn10QGIIC7nCklo1W6QMUmPGVWH994N976tZP6gbjQL6sT+AYcvpx7j0ubxYYeRNvnz+ACzzY964kGGHY0ECgYEAumlwPPNnMN7+VEjGNm2D7UMdJZ3wi3tkjF5ThdA5uMohTsAk+FG80KSu3RmOaGyEsUwY7+VYyYvlDm4E9PZqLBVVczyR3rMNPAcwPd0EPfvzk7WlLkOX7ct3fehaXH3VRlyfz9KCSeh1wOZ/lT1VtpD2nVOC7PSDzs92+kfXZZ0CgYAnrD1y4skgXkdwolZ3unn3EFyGm2d+X5aMTHwQPdWxqoNIAl/9wdghlzihwnPhhsxq1WzlxuC3V2IMrNPtRx70Mi+FbSmR5m4Xx5RptgMtMlwno+L40PzNJgMjHGjt0wcx3Vel8wuohDtnqMyS7P5nG1/TQx0Cyzwn7QOXlNpgbQ==
+-----END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/dbrepo-search-service/tests/rsa/rsa/rsa256.pkey b/dbrepo-search-service/tests/rsa/rsa/rsa256.pkey
new file mode 100644
index 0000000000..857dfb22be
--- /dev/null
+++ b/dbrepo-search-service/tests/rsa/rsa/rsa256.pkey
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/dbrepo-search-service/test/test_app.py b/dbrepo-search-service/tests/test_app.py
similarity index 100%
rename from dbrepo-search-service/test/test_app.py
rename to dbrepo-search-service/tests/test_app.py
diff --git a/dbrepo-search-service/test/test_jwt.py b/dbrepo-search-service/tests/test_jwt.py
similarity index 100%
rename from dbrepo-search-service/test/test_jwt.py
rename to dbrepo-search-service/tests/test_jwt.py
diff --git a/dbrepo-ui/test/test_heap.sh b/dbrepo-ui/tests/test_heap.sh
similarity index 100%
rename from dbrepo-ui/test/test_heap.sh
rename to dbrepo-ui/tests/test_heap.sh
-- 
GitLab