X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/0ad1b28497b49bf8baa5cfa2ea4438c4824617a1..389138abfe11eef3207f63d432865b00119beb3c:/test/python/test_cli.py diff --git a/test/python/test_cli.py b/test/python/test_cli.py index cde84759..aa6a5c7f 100644 --- a/test/python/test_cli.py +++ b/test/python/test_cli.py @@ -11,7 +11,13 @@ 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.admin +import nominatim.tools.check_database +import nominatim.tools.freeze import nominatim.tools.refresh import nominatim.tools.replication from nominatim.errors import UsageError @@ -20,9 +26,11 @@ from nominatim.db import status def call_nominatim(*args): return nominatim.cli.nominatim(module_dir='build/module', osm2pgsql_path='build/osm2pgsql/osm2pgsql', - phplib_dir='lib', + phplib_dir='lib-php', data_dir='.', phpcgi_path='/usr/bin/php-cgi', + sqllib_dir='lib-sql', + config_dir='settings', cli_args=args) class MockParamCapture: @@ -46,11 +54,13 @@ def mock_run_legacy(monkeypatch): return mock @pytest.fixture -def mock_run_api(monkeypatch): - mock = MockParamCapture() - monkeypatch.setattr(nominatim.cli, 'run_api_script', mock) - return mock +def mock_func_factory(monkeypatch): + def get_mock(module, func): + mock = MockParamCapture() + monkeypatch.setattr(module, func, mock) + return mock + return get_mock def test_cli_help(capsys): """ Running nominatim tool without arguments prints help. @@ -63,12 +73,9 @@ def test_cli_help(capsys): @pytest.mark.parametrize("command,script", [ (('import', '--continue', 'load-data'), 'setup'), - (('freeze',), 'setup'), (('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): @@ -78,6 +85,42 @@ def test_legacy_commands_simple(mock_run_legacy, command, script): assert mock_run_legacy.last_args[0] == script + '.php' +def test_freeze_command(mock_func_factory, temp_db): + mock_drop = mock_func_factory(nominatim.tools.freeze, 'drop_update_tables') + mock_flatnode = mock_func_factory(nominatim.tools.freeze, 'drop_flatnode_file') + + assert 0 == call_nominatim('freeze') + + assert mock_drop.called == 1 + assert mock_flatnode.called == 1 + + +@pytest.mark.parametrize("params", [('--warm', ), + ('--warm', '--reverse-only'), + ('--warm', '--search-only')]) +def test_admin_command_legacy(mock_func_factory, params): + mock_run_legacy = mock_func_factory(nominatim.clicmd.admin, 'run_legacy_script') + + assert 0 == call_nominatim('admin', *params) + + assert mock_run_legacy.called == 1 + + +@pytest.mark.parametrize("func, params", [('analyse_indexing', ('--analyse-indexing', ))]) +def test_admin_command_tool(temp_db, mock_func_factory, func, params): + mock = mock_func_factory(nominatim.tools.admin, func) + + assert 0 == call_nominatim('admin', *params) + assert mock.called == 1 + + +def test_admin_command_check_database(mock_func_factory): + mock = mock_func_factory(nominatim.tools.check_database, 'check_database') + + assert 0 == call_nominatim('admin', '--check-database') + assert mock.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): @@ -92,12 +135,10 @@ def test_add_data_command(mock_run_legacy, name, oid): (['--boundaries-only'], 1, 0), (['--no-boundaries'], 0, 1), (['--boundaries-only', '--no-boundaries'], 0, 0)]) -def test_index_command(monkeypatch, temp_db_cursor, params, do_bnds, do_ranks): +def test_index_command(mock_func_factory, temp_db_cursor, params, do_bnds, do_ranks): temp_db_cursor.execute("CREATE TABLE import_status (indexed bool)") - bnd_mock = MockParamCapture() - monkeypatch.setattr(nominatim.indexer.indexer.Indexer, 'index_boundaries', bnd_mock) - rank_mock = MockParamCapture() - monkeypatch.setattr(nominatim.indexer.indexer.Indexer, 'index_by_rank', rank_mock) + bnd_mock = mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_boundaries') + rank_mock = mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_by_rank') assert 0 == call_nominatim('index', *params) @@ -108,9 +149,10 @@ def test_index_command(monkeypatch, temp_db_cursor, params, do_bnds, do_ranks): @pytest.mark.parametrize("command,params", [ ('wiki-data', ('setup.php', '--import-wikipedia-articles')), ('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(mock_func_factory, temp_db, command, params): + mock_run_legacy = mock_func_factory(nominatim.clicmd.refresh, 'run_legacy_script') + assert 0 == call_nominatim('refresh', '--' + command) assert mock_run_legacy.called == 1 @@ -122,16 +164,18 @@ def test_refresh_legacy_command(mock_run_legacy, temp_db, command, params): ('word-counts', 'recompute_word_counts'), ('address-levels', 'load_address_levels_from_file'), ('functions', 'create_functions'), + ('website', 'setup_website'), ]) -def test_refresh_command(monkeypatch, temp_db, command, func): - func_mock = MockParamCapture() - monkeypatch.setattr(nominatim.tools.refresh, func, func_mock) +def test_refresh_command(mock_func_factory, temp_db, command, func): + func_mock = mock_func_factory(nominatim.tools.refresh, func) assert 0 == call_nominatim('refresh', '--' + command) 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(mock_func_factory, temp_db): + mock_run_legacy = mock_func_factory(nominatim.clicmd.refresh, 'run_legacy_script') + assert 0 == call_nominatim('refresh', '--importance', '--wiki-data') assert mock_run_legacy.called == 2 @@ -142,9 +186,8 @@ def test_refresh_importance_computed_after_wiki_import(mock_run_legacy, temp_db) (('--init', '--no-update-functions'), 'init_replication'), (('--check-for-updates',), 'check_for_updates') ]) -def test_replication_command(monkeypatch, temp_db, params, func): - func_mock = MockParamCapture() - monkeypatch.setattr(nominatim.tools.replication, func, func_mock) +def test_replication_command(mock_func_factory, temp_db, params, func): + func_mock = mock_func_factory(nominatim.tools.replication, func) assert 0 == call_nominatim('replication', *params) assert func_mock.called == 1 @@ -163,17 +206,14 @@ def test_replication_update_bad_interval_for_geofabrik(monkeypatch, temp_db): assert call_nominatim('replication') == 1 -@pytest.mark.parametrize("state, retval", [ - (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, temp_db_conn, - status_table, state, retval): +@pytest.mark.parametrize("state", [nominatim.tools.replication.UpdateState.UP_TO_DATE, + nominatim.tools.replication.UpdateState.NO_CHANGES]) +def test_replication_update_once_no_index(mock_func_factory, temp_db, temp_db_conn, + status_table, state): 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) + func_mock = mock_func_factory(nominatim.tools.replication, 'update') - assert retval == call_nominatim('replication', '--once', '--no-index') + assert 0 == call_nominatim('replication', '--once', '--no-index') def test_replication_update_continuous(monkeypatch, temp_db_conn, status_table): @@ -215,6 +255,13 @@ def test_replication_update_continuous_no_change(monkeypatch, temp_db_conn, stat assert sleep_mock.last_args[0] == 60 +def test_serve_command(mock_func_factory): + func = mock_func_factory(nominatim.cli, 'run_php_server') + + call_nominatim('serve') + + assert func.called == 1 + @pytest.mark.parametrize("params", [ ('search', '--query', 'new'), ('reverse', '--lat', '0', '--lon', '0'), @@ -225,7 +272,9 @@ def test_replication_update_continuous_no_change(monkeypatch, temp_db_conn, stat ('details', '--place_id', '10001'), ('status',) ]) -def test_api_commands_simple(mock_run_api, params): +def test_api_commands_simple(mock_func_factory, params): + mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script') + assert 0 == call_nominatim(*params) assert mock_run_api.called == 1