Merge pull request #366 from matchID-project/codex/ajouter-tests-avec-pytest-yqynwr

Integrate tests into docker workflows

Author: rhanka

.github/workflows/pull.yml

@@ -14,6 +14,11 @@ jobs:
         id: extract_branch
       - name: build
         if: success()
-        run: make version backend-docker-check GIT_BRANCH=$GIT_BRANCH || ( make backend-build GIT_BRANCH=$GIT_BRANCH && make backend backend-stop GIT_BRANCH=$GIT_BRANCH)
+        run: make version backend-docker-check GIT_BRANCH=$GIT_BRANCH || ( make backend-build GIT_BRANCH=$GIT_BRANCH && make backend GIT_BRANCH=$GIT_BRANCH)
+        env:
+          GIT_BRANCH: ${{ steps.extract_branch.outputs.branch }}
+      - name: tests
+        if: success()
+        run: make tests backend-stop GIT_BRANCH=$GIT_BRANCH
         env:
           GIT_BRANCH: ${{ steps.extract_branch.outputs.branch }}

.github/workflows/push.yml

@@ -21,6 +21,11 @@ jobs:
         run: make version backend-docker-check GIT_BRANCH=$GIT_BRANCH || ( make backend-build GIT_BRANCH=$GIT_BRANCH && make backend backend-stop GIT_BRANCH=$GIT_BRANCH)
         env:
           GIT_BRANCH: ${{ steps.extract_branch.outputs.branch }}
+      - name: tests
+        if: success()
+        run: make tests
+        env:
+          GIT_BRANCH: ${{ steps.extract_branch.outputs.branch }}
       - name: publish
         if: success()
         run: |

Dockerfile

@@ -23,7 +23,7 @@ RUN mkdir -p code\
              conf/run\
              log\
              referential_data\
-             matchID_test/\
+             tests\
              upload
 
 ################################
@@ -41,11 +41,13 @@ WORKDIR /${APP}
 COPY code/ code/
 COPY conf/ conf/
 COPY referential_data/ referential_data/
+COPY tests/ tests/
 
 VOLUME /${app_path}/projects
 VOLUME /${app_path}/log
 VOLUME /${app_path}/models
 VOLUME /${app_path}/upload
+VOLUME /${app_path}/tests
 
 EXPOSE ${BACKEND_PORT}
 
@@ -68,6 +70,7 @@ VOLUME /${APP}/referential_data
 VOLUME /${APP}/log
 VOLUME /${APP}/models
 VOLUME /${APP}/upload
+VOLUME /${APP}/tests
 
 EXPOSE ${BACKEND_PORT}
 

Makefile

@@ -36,6 +36,7 @@ export GITHUB_OAUTH_SECRET=203010f81158d3ceab0297a213e80bc0fbfe7f8e
 export BACKEND := $(shell pwd)
 export UPLOAD=${BACKEND}/upload
 export PROJECTS=${BACKEND}/projects
+export TESTS=${BACKEND}/tests
 export EXAMPLES=${BACKEND}/../examples
 export TUTORIAL=${BACKEND}/../tutorial
 export MODELS=${BACKEND}/models
@@ -696,3 +697,8 @@ deploy-remote: config deploy-remote-instance deploy-remote-services deploy-remot
 
 clean-remote:
 	@make -C ${APP_PATH}/${GIT_TOOLS} remote-clean ${MAKEOVERRIDES} > /dev/null 2>&1 || true
+
+tests:
+	@docker exec -i ${USE_TTY} ${DC_PREFIX}-${APP} pytest -q -W "ignore::DeprecationWarning" -W "ignore::FutureWarning"
+
+.PHONY: tests

README.md

@@ -128,3 +128,14 @@ If you want to contribute to the developpement, you'll be able to fork the repo
 ```
 make start-dev
 ```
+
+### Running tests
+Install dependencies and run tests with Make:
+```bash
+make tests
+```
+You can also install the requirements and run pytest directly:
+```bash
+pip install -r requirements.txt
+pytest
+```

docker-compose-dev.yml

@@ -8,3 +8,4 @@ services:
       - ${BACKEND}/code/:/${APP_GROUP}/code/
       - ${BACKEND}/referential_data/:/${APP_GROUP}/referential_data/
       - ${BACKEND}/conf/:/${APP_GROUP}/conf/
+      - ${BACKEND}/tests/:/${APP_GROUP}/tests/

requirements.txt

@@ -25,4 +25,5 @@ typing
 Werkzeug==3.0.3
 rsa>=4.7 # not directly required, pinned by Snyk to avoid a vulnerability
 zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
-pyarrow>=14.0.1
+pyarrow>=14.0.1
+pytest