From 034addb2348e66683342fbfd36c4b44224641ce0 Mon Sep 17 00:00:00 2001 From: Dmitriy Kazimirov <dmitriy.kazimirov@viorsan.com> Date: Wed, 2 Apr 2025 04:06:56 +0000 Subject: [PATCH] now tests no longer use compose --- docker-compose.yml | 7 ------- scripts/run_tests.sh | 16 +++++++++------- src/api/app.py | 5 +---- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e52e063..07d9d58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,10 +38,3 @@ services: timeout: 10s retries: 5 - booksearch_tests: - build: . - container_name: booksearch_tests - volumes: - - ./test_data:/app/test_data - - ./tests:/app/tests - command: sh -c "cd /app && PYTHONPATH=/app python -m unittest tests.unit.test_epub_extraction -v" diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 2a13f74..9c03f17 100644 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -3,11 +3,13 @@ # Get absolute path to project root PROJECT_ROOT=$(dirname $(dirname $(realpath $0))) +# Build the test image +docker build -t booksearch_tests . + # Run the test container -docker-compose -f $PROJECT_ROOT/docker-compose.yml up -d booksearch_tests - -# Follow the logs -docker logs -f booksearch_tests - -# Clean up -docker-compose -f $PROJECT_ROOT/docker-compose.yml down +docker run --rm \ + -v $PROJECT_ROOT/test_data:/app/test_data \ + -v $PROJECT_ROOT/tests:/app/tests \ + --name booksearch_tests \ + booksearch_tests \ + sh -c "cd /app && PYTHONPATH=/app python -m unittest tests.unit.test_epub_extraction -v" diff --git a/src/api/app.py b/src/api/app.py index ea4713d..f839b0f 100644 --- a/src/api/app.py +++ b/src/api/app.py @@ -9,10 +9,7 @@ import PyPDF2 import time import logging import multiprocessing -import sys -from pathlib import Path -sys.path.append(str(Path(__file__).parent.parent)) -from index import index_files, get_progress +from src.core.index import index_files, get_progress from io import StringIO import sys