Merge pull request #3588 from lonvia/optional-reverse-api

[nominatim.git] / test / python / api / conftest.py

diff --git a/test/python/api/conftest.py b/test/python/api/conftest.py
index 08b7422c9c38bc8d0a8dc31cd3fb8f1547460ce3..3ca0720b4da24f76a76b0f30e3084af5e87d2802 100644 (file)
--- a/test/python/api/conftest.py
+++ b/test/python/api/conftest.py
@@ -7,15 +7,15 @@
 """
 Helper fixtures for API call tests.
 """
 """
 Helper fixtures for API call tests.
 """

-from pathlib import Path

 import pytest
 import pytest

+import pytest_asyncio

 import time
 import datetime as dt
 
 import sqlalchemy as sa
 
 import nominatim_api as napi
 import time
 import datetime as dt
 
 import sqlalchemy as sa
 
 import nominatim_api as napi

-from nominatim_core.db.sql_preprocessor import SQLPreprocessor
+from nominatim_db.db.sql_preprocessor import SQLPreprocessor

 from nominatim_api.search.query_analyzer_factory import make_query_analyzer
 from nominatim_db.tools import convert_sqlite
 import nominatim_api.logging as loglib
 from nominatim_api.search.query_analyzer_factory import make_query_analyzer
 from nominatim_db.tools import convert_sqlite
 import nominatim_api.logging as loglib


@@ -23,7 +23,7 @@ import nominatim_api.logging as loglib
 class APITester:
 
     def __init__(self):
 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())
 
 
         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())
 
 
             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
             testapis.append(outapi)
 
             return outapi


@@ -244,3 +242,9 @@ def frontend(request, event_loop, tmp_path):
 
     for api in testapis:
         api.close()
 
     for api in testapis:
         api.close()

+
+
+@pytest_asyncio.fixture
+async def api(temp_db):
+    async with napi.NominatimAPIAsync() as api:
+        yield api