make NominatimAPI[Async] a context manager

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

diff --git a/test/python/api/test_api_deletable_v1.py b/test/python/api/test_api_deletable_v1.py
index 4c5d96b633053ffe7ef3ce45aeebc8a024bae521..9e1138869e8d632b322dce7d7306c7f9cd920f26 100644 (file)
--- a/test/python/api/test_api_deletable_v1.py
+++ b/test/python/api/test_api_deletable_v1.py
@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2023 by the Nominatim developer community.
+# Copyright (C) 2024 by the Nominatim developer community.

 # For a full list of authors see the git log.
 """
 Tests for the deletable v1 API call.
 # For a full list of authors see the git log.
 """
 Tests for the deletable v1 API call.


@@ -11,27 +11,15 @@ import json
 from pathlib import Path
 
 import pytest
 from pathlib import Path
 
 import pytest

-import pytest_asyncio
-
-import psycopg2.extras

 
 from fake_adaptor import FakeAdaptor, FakeError, FakeResponse
 
 
 from fake_adaptor import FakeAdaptor, FakeError, FakeResponse
 

-import nominatim.api.v1.server_glue as glue
-import nominatim.api as napi
-
-@pytest_asyncio.fixture
-async def api():
-    api = napi.NominatimAPIAsync(Path('/invalid'))
-    yield api
-    await api.close()
-
+import nominatim_api.v1.server_glue as glue

 
 class TestDeletableEndPoint:
 
     @pytest.fixture(autouse=True)
     def setup_deletable_table(self, temp_db_cursor, table_factory, temp_db_with_extensions):
 
 class TestDeletableEndPoint:
 
     @pytest.fixture(autouse=True)
     def setup_deletable_table(self, temp_db_cursor, table_factory, temp_db_with_extensions):

-        psycopg2.extras.register_hstore(temp_db_cursor)

         table_factory('import_polygon_delete',
                       definition='osm_id bigint, osm_type char(1), class text, type text',
                       content=[(345, 'N', 'boundary', 'administrative'),
         table_factory('import_polygon_delete',
                       definition='osm_id bigint, osm_type char(1), class text, type text',
                       content=[(345, 'N', 'boundary', 'administrative'),


@@ -64,4 +52,3 @@ class TestDeletableEndPoint:
                            {'place_id': 3, 'country_code': 'cd', 'name': None,
                             'osm_id': 781, 'osm_type': 'R',
                             'class': 'landcover', 'type': 'grass'}]
                            {'place_id': 3, 'country_code': 'cd', 'name': None,
                             'osm_id': 781, 'osm_type': 'R',
                             'class': 'landcover', 'type': 'grass'}]

-