X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5ec2c1b7123bf0770075e12380c17959f2d95cff..c41f2fed2133668dc3179813261d39d3ff69cbdd:/test/python/tools/test_refresh.py?ds=sidebyside diff --git a/test/python/tools/test_refresh.py b/test/python/tools/test_refresh.py index 3175cb97..3e0a2801 100644 --- a/test/python/tools/test_refresh.py +++ b/test/python/tools/test_refresh.py @@ -21,10 +21,15 @@ def test_refresh_import_secondary_importance_non_existing(dsn): assert refresh.import_secondary_importance(dsn, Path('.')) == 1 def test_refresh_import_secondary_importance_testdb(dsn, src_dir, temp_db_conn, temp_db_cursor): - temp_db_cursor.execute('CREATE EXTENSION postgis; CREATE EXTENSION postgis_raster') - assert refresh.import_secondary_importance(dsn, src_dir / 'test' / 'testdb') == 0 + temp_db_cursor.execute('CREATE EXTENSION postgis') - assert temp_db_conn.table_exists('secondary_importance') + if temp_db_conn.postgis_version_tuple()[0] < 3: + assert refresh.import_secondary_importance(dsn, src_dir / 'test' / 'testdb') > 0 + else: + temp_db_cursor.execute('CREATE EXTENSION postgis_raster') + assert refresh.import_secondary_importance(dsn, src_dir / 'test' / 'testdb') == 0 + + assert temp_db_conn.table_exists('secondary_importance') @pytest.mark.parametrize("replace", (True, False)) @@ -43,7 +48,7 @@ def test_refresh_import_wikipedia(dsn, src_dir, table_factory, temp_db_cursor, r def test_recompute_importance(placex_table, table_factory, temp_db_conn, temp_db_cursor): temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION compute_importance(extratags HSTORE, country_code varchar(2), - osm_type varchar(1), osm_id BIGINT, + rank_search SMALLINT, centroid GEOMETRY, OUT importance FLOAT, OUT wikipedia TEXT)