safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

correctly close API objects during testing

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-12-05 21:20:57 +01:00
parent 615b166c68
commit 8791c6cb69
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nominatim/tools/convert_sqlite.py
View File

@@ -29,9 +29,12 @@ async def convert(project_dir: Path, outfile: Path, options: Set[str]) -> None:
outapi = napi.NominatimAPIAsync(project_dir, outapi = napi.NominatimAPIAsync(project_dir,
{'NOMINATIM_DATABASE_DSN': f"sqlite:dbname={outfile}"}) {'NOMINATIM_DATABASE_DSN': f"sqlite:dbname={outfile}"})
async with api.begin() as src, outapi.begin() as dest: try:
writer = SqliteWriter(src, dest, options) async with api.begin() as src, outapi.begin() as dest:
await writer.write() writer = SqliteWriter(src, dest, options)
await writer.write()
finally:
await outapi.close()
finally: finally:
await api.close() await api.close()

16
test/python/api/conftest.py
View File

@@ -190,18 +190,24 @@ def apiobj(temp_db_with_extensions, temp_db_conn, monkeypatch):
@pytest.fixture(params=['postgres_db', 'sqlite_db']) @pytest.fixture(params=['postgres_db', 'sqlite_db'])
def frontend(request, event_loop, tmp_path): def frontend(request, event_loop, tmp_path):
testapis = []
if request.param == 'sqlite_db': if request.param == 'sqlite_db':
db = str(tmp_path / 'test_nominatim_python_unittest.sqlite') db = str(tmp_path / 'test_nominatim_python_unittest.sqlite')
def mkapi(apiobj, options={'reverse'}): def mkapi(apiobj, options={'reverse'}):
event_loop.run_until_complete(convert_sqlite.convert(Path('/invalid'), event_loop.run_until_complete(convert_sqlite.convert(Path('/invalid'),
db, options)) db, options))
return napi.NominatimAPI(Path('/invalid'), outapi = napi.NominatimAPI(Path('/invalid'),
{'NOMINATIM_DATABASE_DSN': f"sqlite:dbname={db}", {'NOMINATIM_DATABASE_DSN': f"sqlite:dbname={db}",
'NOMINATIM_USE_US_TIGER_DATA': 'yes', 'NOMINATIM_USE_US_TIGER_DATA': 'yes'})
'NOMINATIM_API_POOL_SIZE': '0'}) testapis.append(outapi)
return outapi
elif request.param == 'postgres_db': elif request.param == 'postgres_db':
def mkapi(apiobj, options=None): def mkapi(apiobj, options=None):
return apiobj.api return apiobj.api
return mkapi yield mkapi
for api in testapis:
api.close()