X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2bab0ca060ff224091b20a0ac808a3febaba04b1..5475bf7b9c398efa775089fe30624cdc49aa112d:/test/python/tools/test_refresh.py diff --git a/test/python/tools/test_refresh.py b/test/python/tools/test_refresh.py index 50ff6398..8f735180 100644 --- a/test/python/tools/test_refresh.py +++ b/test/python/tools/test_refresh.py @@ -12,6 +12,7 @@ from pathlib import Path import pytest from nominatim_db.tools import refresh +from nominatim_db.db.connection import postgis_version_tuple def test_refresh_import_wikipedia_not_existing(dsn): assert refresh.import_wikipedia_articles(dsn, Path('.')) == 1 @@ -22,14 +23,10 @@ def test_refresh_import_secondary_importance_non_existing(dsn): def test_refresh_import_secondary_importance_testdb(dsn, src_dir, temp_db_conn, temp_db_cursor): temp_db_cursor.execute('CREATE EXTENSION postgis') + temp_db_cursor.execute('CREATE EXTENSION postgis_raster') + assert refresh.import_secondary_importance(dsn, src_dir / 'test' / 'testdb') == 0 - 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') + assert temp_db_cursor.table_exists('secondary_importance') @pytest.mark.parametrize("replace", (True, False)) @@ -40,8 +37,7 @@ def test_refresh_import_wikipedia(dsn, src_dir, table_factory, temp_db_cursor, r # use the small wikipedia file for the API testdb assert refresh.import_wikipedia_articles(dsn, src_dir / 'test' / 'testdb') == 0 - assert temp_db_cursor.table_rows('wikipedia_article') > 0 - assert temp_db_cursor.table_rows('wikipedia_redirect') > 0 + assert temp_db_cursor.table_rows('wikimedia_importance') > 0 def test_recompute_importance(placex_table, table_factory, temp_db_conn, temp_db_cursor):