mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-02-15 02:47:59 +00:00
move update code for postcode and word count to Python
Adds also tests for the new function to execute a SQL script.
This commit is contained in:
@@ -6,6 +6,7 @@ import pytest
|
||||
|
||||
import nominatim.cli
|
||||
import nominatim.indexer.indexer
|
||||
import nominatim.tools.refresh
|
||||
|
||||
def call_nominatim(*args):
|
||||
return nominatim.cli.nominatim(module_dir='build/module',
|
||||
@@ -99,21 +100,30 @@ def test_index_command(monkeypatch, temp_db, params, do_bnds, do_ranks):
|
||||
|
||||
|
||||
@pytest.mark.parametrize("command,params", [
|
||||
('postcodes', ('update.php', '--calculate-postcodes')),
|
||||
('word-counts', ('update.php', '--recompute-word-counts')),
|
||||
('address-levels', ('update.php', '--update-address-levels')),
|
||||
('functions', ('setup.php',)),
|
||||
('wiki-data', ('setup.php', '--import-wikipedia-articles')),
|
||||
('importance', ('update.php', '--recompute-importance')),
|
||||
('website', ('setup.php', '--setup-website')),
|
||||
])
|
||||
def test_refresh_command(mock_run_legacy, command, params):
|
||||
def test_refresh_legacy_command(mock_run_legacy, command, params):
|
||||
assert 0 == call_nominatim('refresh', '--' + command)
|
||||
|
||||
assert mock_run_legacy.called == 1
|
||||
assert len(mock_run_legacy.last_args) >= len(params)
|
||||
assert mock_run_legacy.last_args[:len(params)] == params
|
||||
|
||||
@pytest.mark.parametrize("command,func", [
|
||||
('postcodes', 'update_postcodes'),
|
||||
('word-counts', 'recompute_word_counts'),
|
||||
])
|
||||
def test_refresh_command(monkeypatch, command, func):
|
||||
func_mock = MockParamCapture()
|
||||
monkeypatch.setattr(nominatim.tools.refresh, func, func_mock)
|
||||
|
||||
assert 0 == call_nominatim('refresh', '--' + command)
|
||||
|
||||
assert func_mock.called == 1
|
||||
|
||||
def test_refresh_importance_computed_after_wiki_import(mock_run_legacy):
|
||||
assert 0 == call_nominatim('refresh', '--importance', '--wiki-data')
|
||||
|
||||
33
test/python/test_db_utils.py
Normal file
33
test/python/test_db_utils.py
Normal file
@@ -0,0 +1,33 @@
|
||||
"""
|
||||
Tests for DB utility functions in db.utils
|
||||
"""
|
||||
import psycopg2
|
||||
import pytest
|
||||
|
||||
import nominatim.db.utils as db_utils
|
||||
|
||||
def test_execute_file_success(temp_db, tmp_path):
|
||||
tmpfile = tmp_path / 'test.sql'
|
||||
tmpfile.write_text('CREATE TABLE test (id INT);\nINSERT INTO test VALUES(56);')
|
||||
|
||||
with psycopg2.connect('dbname=' + temp_db) as conn:
|
||||
db_utils.execute_file(conn, tmpfile)
|
||||
|
||||
with conn.cursor() as cur:
|
||||
cur.execute('SELECT * FROM test')
|
||||
|
||||
assert cur.rowcount == 1
|
||||
assert cur.fetchone()[0] == 56
|
||||
|
||||
def test_execute_file_bad_file(temp_db, tmp_path):
|
||||
with psycopg2.connect('dbname=' + temp_db) as conn:
|
||||
with pytest.raises(FileNotFoundError):
|
||||
db_utils.execute_file(conn, tmp_path / 'test2.sql')
|
||||
|
||||
def test_execute_file_bad_sql(temp_db, tmp_path):
|
||||
tmpfile = tmp_path / 'test.sql'
|
||||
tmpfile.write_text('CREATE STABLE test (id INT)')
|
||||
|
||||
with psycopg2.connect('dbname=' + temp_db) as conn:
|
||||
with pytest.raises(psycopg2.ProgrammingError):
|
||||
db_utils.execute_file(conn, tmpfile)
|
||||
Reference in New Issue
Block a user