X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e629a175ed0a1c54398622251f56d56baeef768f..0cbf98c0204f0e90e1f6d22110eb80ee87dae0e0:/test/python/test_cli.py diff --git a/test/python/test_cli.py b/test/python/test_cli.py index c4f3ef36..9b39f580 100644 --- a/test/python/test_cli.py +++ b/test/python/test_cli.py @@ -5,15 +5,20 @@ These tests just check that the various command line parameters route to the correct functionionality. They use a lot of monkeypatching to avoid executing the actual functions. """ +import datetime as dt import psycopg2 import pytest import time import nominatim.cli +import nominatim.clicmd.api +import nominatim.clicmd.refresh +import nominatim.clicmd.admin import nominatim.indexer.indexer import nominatim.tools.refresh import nominatim.tools.replication from nominatim.errors import UsageError +from nominatim.db import status def call_nominatim(*args): return nominatim.cli.nominatim(module_dir='build/module', @@ -43,12 +48,6 @@ def mock_run_legacy(monkeypatch): monkeypatch.setattr(nominatim.cli, 'run_legacy_script', mock) return mock -@pytest.fixture -def mock_run_api(monkeypatch): - mock = MockParamCapture() - monkeypatch.setattr(nominatim.cli, 'run_api_script', mock) - return mock - def test_cli_help(capsys): """ Running nominatim tool without arguments prints help. @@ -65,8 +64,6 @@ def test_cli_help(capsys): (('special-phrases',), 'specialphrases'), (('add-data', '--tiger-data', 'tiger'), 'setup'), (('add-data', '--file', 'foo.osm'), 'update'), - (('check-database',), 'check_import_finished'), - (('warm',), 'warm'), (('export',), 'export') ]) def test_legacy_commands_simple(mock_run_legacy, command, script): @@ -76,6 +73,19 @@ def test_legacy_commands_simple(mock_run_legacy, command, script): assert mock_run_legacy.last_args[0] == script + '.php' +@pytest.mark.parametrize("params", [('--warm', ), + ('--warm', '--reverse-only'), + ('--warm', '--search-only'), + ('--check-database', )]) +def test_admin_command_legacy(monkeypatch, params): + mock_run_legacy = MockParamCapture() + monkeypatch.setattr(nominatim.clicmd.admin, 'run_legacy_script', mock_run_legacy) + + assert 0 == call_nominatim('admin', *params) + + assert mock_run_legacy.called == 1 + + @pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc'), ('node', 12), ('way', 8), ('relation', 32)]) def test_add_data_command(mock_run_legacy, name, oid): @@ -108,7 +118,10 @@ def test_index_command(monkeypatch, temp_db_cursor, params, do_bnds, do_ranks): ('importance', ('update.php', '--recompute-importance')), ('website', ('setup.php', '--setup-website')), ]) -def test_refresh_legacy_command(mock_run_legacy, temp_db, command, params): +def test_refresh_legacy_command(monkeypatch, temp_db, command, params): + mock_run_legacy = MockParamCapture() + monkeypatch.setattr(nominatim.clicmd.refresh, 'run_legacy_script', mock_run_legacy) + assert 0 == call_nominatim('refresh', '--' + command) assert mock_run_legacy.called == 1 @@ -129,7 +142,10 @@ def test_refresh_command(monkeypatch, temp_db, command, func): assert func_mock.called == 1 -def test_refresh_importance_computed_after_wiki_import(mock_run_legacy, temp_db): +def test_refresh_importance_computed_after_wiki_import(monkeypatch, temp_db): + mock_run_legacy = MockParamCapture() + monkeypatch.setattr(nominatim.clicmd.refresh, 'run_legacy_script', mock_run_legacy) + assert 0 == call_nominatim('refresh', '--importance', '--wiki-data') assert mock_run_legacy.called == 2 @@ -165,14 +181,17 @@ def test_replication_update_bad_interval_for_geofabrik(monkeypatch, temp_db): (nominatim.tools.replication.UpdateState.UP_TO_DATE, 0), (nominatim.tools.replication.UpdateState.NO_CHANGES, 3) ]) -def test_replication_update_once_no_index(monkeypatch, temp_db, status_table, state, retval): +def test_replication_update_once_no_index(monkeypatch, temp_db, temp_db_conn, + status_table, state, retval): + status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1) func_mock = MockParamCapture(retval=state) monkeypatch.setattr(nominatim.tools.replication, 'update', func_mock) assert retval == call_nominatim('replication', '--once', '--no-index') -def test_replication_update_continuous(monkeypatch, status_table): +def test_replication_update_continuous(monkeypatch, temp_db_conn, status_table): + status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1) states = [nominatim.tools.replication.UpdateState.UP_TO_DATE, nominatim.tools.replication.UpdateState.UP_TO_DATE] monkeypatch.setattr(nominatim.tools.replication, 'update', @@ -188,7 +207,8 @@ def test_replication_update_continuous(monkeypatch, status_table): assert index_mock.called == 4 -def test_replication_update_continuous_no_change(monkeypatch, status_table): +def test_replication_update_continuous_no_change(monkeypatch, temp_db_conn, status_table): + status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1) states = [nominatim.tools.replication.UpdateState.NO_CHANGES, nominatim.tools.replication.UpdateState.UP_TO_DATE] monkeypatch.setattr(nominatim.tools.replication, 'update', @@ -209,6 +229,14 @@ def test_replication_update_continuous_no_change(monkeypatch, status_table): assert sleep_mock.last_args[0] == 60 +def test_serve_command(monkeypatch): + func = MockParamCapture() + monkeypatch.setattr(nominatim.cli, 'run_php_server', func) + + call_nominatim('serve') + + assert func.called == 1 + @pytest.mark.parametrize("params", [ ('search', '--query', 'new'), ('reverse', '--lat', '0', '--lon', '0'), @@ -219,7 +247,10 @@ def test_replication_update_continuous_no_change(monkeypatch, status_table): ('details', '--place_id', '10001'), ('status',) ]) -def test_api_commands_simple(mock_run_api, params): +def test_api_commands_simple(monkeypatch, params): + mock_run_api = MockParamCapture() + monkeypatch.setattr(nominatim.clicmd.api, 'run_api_script', mock_run_api) + assert 0 == call_nominatim(*params) assert mock_run_api.called == 1