Tests cleanup (#52)

a1d4r · Apr 2, 2024 · 8311325 · 8311325
1 parent 75364f6
commit 8311325
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 174 deletions.
diff --git a/async_api/tests/conftest.py b/async_api/tests/conftest.py
@@ -1,12 +0,0 @@
-import pytest
-
-from elasticsearch import AsyncElasticsearch
-
-from core.settings import settings
-
-
-@pytest.fixture()
-async def elastic():
-    es = AsyncElasticsearch(settings.elasticsearch_host)
-    yield es
-    await es.close()

diff --git a/async_api/tests/functional/README.md b/async_api/tests/functional/README.md
@@ -11,6 +11,7 @@ docker compose up -d
 ```
 
 Команда запустит:
+
 - API-сервис по адресу http://localhost:8001 (в сети докера http://api:8000)
 - Elasticsearch по адресу http://localhost:9201 (в сети докера http://test-elasticsearch:9200)
 - Redis по адресу `redis://localhost:6380` (в сети докера `redis://test-redis:6379`)
@@ -21,8 +22,16 @@ docker compose up -d
 docker compose down
 ```
 
-### Запуск тестов
+### Запуск тестов локально
 
 ```
 python -m pytest -k functional
 ```
+
+### Запуск тестов в докере
+
+Можно запустить все тесты в докере:
+
+```
+docker compose -f docker-compose.ci.yml up --build --exit-code-from test-runner
+```
diff --git a/async_api/tests/test_services/__init__.py b/async_api/tests/test_services/__init__.py
diff --git a/async_api/tests/test_services/test_film_service.py b/async_api/tests/test_services/test_film_service.py
diff --git a/async_api/tests/test_services/test_genre_service.py b/async_api/tests/test_services/test_genre_service.py
diff --git a/async_api/tests/test_services/test_person_service.py b/async_api/tests/test_services/test_person_service.py