X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4da4cbfe27a576ae011430b2de205c74435e241b..c2aa7a9b439740c2ac6b5f1d532c2375a113e921:/test/python/api/conftest.py diff --git a/test/python/api/conftest.py b/test/python/api/conftest.py index a902e264..3ca0720b 100644 --- a/test/python/api/conftest.py +++ b/test/python/api/conftest.py @@ -7,8 +7,8 @@ """ Helper fixtures for API call tests. """ -from pathlib import Path import pytest +import pytest_asyncio import time import datetime as dt @@ -23,7 +23,7 @@ import nominatim_api.logging as loglib class APITester: def __init__(self): - self.api = napi.NominatimAPI(Path('/invalid')) + self.api = napi.NominatimAPI() self.async_to_sync(self.api._async_api.setup_database()) @@ -228,11 +228,9 @@ def frontend(request, event_loop, tmp_path): apiobj.async_to_sync(_do_sql()) - event_loop.run_until_complete(convert_sqlite.convert(Path('/invalid'), - db, options)) - outapi = napi.NominatimAPI(Path('/invalid'), - {'NOMINATIM_DATABASE_DSN': f"sqlite:dbname={db}", - 'NOMINATIM_USE_US_TIGER_DATA': 'yes'}) + event_loop.run_until_complete(convert_sqlite.convert(None, db, options)) + outapi = napi.NominatimAPI(environ={'NOMINATIM_DATABASE_DSN': f"sqlite:dbname={db}", + 'NOMINATIM_USE_US_TIGER_DATA': 'yes'}) testapis.append(outapi) return outapi @@ -244,3 +242,9 @@ def frontend(request, event_loop, tmp_path): for api in testapis: api.close() + + +@pytest_asyncio.fixture +async def api(temp_db): + async with napi.NominatimAPIAsync() as api: + yield api