X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a79ab417823dbb065d94a803633e31db2067cd0b..fa1c402b47bdd1f76b8528885c0e3a5e90731cdc:/test/python/cli/test_cli.py diff --git a/test/python/cli/test_cli.py b/test/python/cli/test_cli.py index e8e18504..688afb7c 100644 --- a/test/python/cli/test_cli.py +++ b/test/python/cli/test_cli.py @@ -1,21 +1,22 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. """ Tests for command line interface wrapper. These tests just check that the various command line parameters route to the -correct functionionality. They use a lot of monkeypatching to avoid executing +correct functionality. They use a lot of monkeypatching to avoid executing the actual functions. """ +import importlib import pytest -import nominatim.indexer.indexer -import nominatim.tools.add_osm_data -import nominatim.tools.freeze +import nominatim_db.indexer.indexer +import nominatim_db.tools.add_osm_data +import nominatim_db.tools.freeze def test_cli_help(cli_call, capsys): @@ -29,14 +30,14 @@ def test_cli_help(cli_call, capsys): def test_cli_version(cli_call, capsys): """ Running nominatim tool --version prints a version string. """ - assert cli_call('--version') == 1 + assert cli_call('--version') == 0 captured = capsys.readouterr() assert captured.out.startswith('Nominatim version') @pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc')]) def test_cli_add_data_file_command(cli_call, mock_func_factory, name, oid): - mock_run_legacy = mock_func_factory(nominatim.tools.add_osm_data, 'add_data_from_file') + mock_run_legacy = mock_func_factory(nominatim_db.tools.add_osm_data, 'add_data_from_file') assert cli_call('add-data', '--' + name, str(oid)) == 0 assert mock_run_legacy.called == 1 @@ -44,7 +45,7 @@ def test_cli_add_data_file_command(cli_call, mock_func_factory, name, oid): @pytest.mark.parametrize("name,oid", [('node', 12), ('way', 8), ('relation', 32)]) def test_cli_add_data_object_command(cli_call, mock_func_factory, name, oid): - mock_run_legacy = mock_func_factory(nominatim.tools.add_osm_data, 'add_osm_object') + mock_run_legacy = mock_func_factory(nominatim_db.tools.add_osm_data, 'add_osm_object') assert cli_call('add-data', '--' + name, str(oid)) == 0 assert mock_run_legacy.called == 1 @@ -52,51 +53,52 @@ def test_cli_add_data_object_command(cli_call, mock_func_factory, name, oid): def test_cli_add_data_tiger_data(cli_call, cli_tokenizer_mock, mock_func_factory): - mock = mock_func_factory(nominatim.tools.tiger_data, 'add_tiger_data') + mock = mock_func_factory(nominatim_db.tools.tiger_data, 'add_tiger_data') assert cli_call('add-data', '--tiger-data', 'somewhere') == 0 assert mock.called == 1 -def test_cli_serve_command(cli_call, mock_func_factory): - func = mock_func_factory(nominatim.cli, 'run_php_server') +def test_cli_serve_php(cli_call, mock_func_factory): + func = mock_func_factory(nominatim_db.cli, 'run_php_server') - cli_call('serve') == 0 + cli_call('serve', '--engine', 'php') == 0 assert func.called == 1 -def test_cli_export_command(cli_call, mock_run_legacy): - assert cli_call('export', '--output-all-postcodes') == 0 +def test_cli_serve_starlette_custom_server(cli_call, mock_func_factory): + pytest.importorskip("starlette") + mod = pytest.importorskip("uvicorn") + func = mock_func_factory(mod, "run") - assert mock_run_legacy.called == 1 - assert mock_run_legacy.last_args[0] == 'export.php' - - -@pytest.mark.parametrize("param,value", [('output-type', 'country'), - ('output-format', 'street;city'), - ('language', 'xf'), - ('restrict-to-country', 'us'), - ('restrict-to-osm-node', '536'), - ('restrict-to-osm-way', '727'), - ('restrict-to-osm-relation', '197532') - ]) -def test_export_parameters(src_dir, tmp_path, param, value): - (tmp_path / 'admin').mkdir() - (tmp_path / 'admin' / 'export.php').write_text(f"""= 0 ? 0 : 10); - """) - - assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE', - osm2pgsql_path='OSM2PGSQL NOT AVAILABLE', - phplib_dir=str(tmp_path), - data_dir=str(src_dir / 'data'), - phpcgi_path='/usr/bin/php-cgi', - sqllib_dir=str(src_dir / 'lib-sql'), - config_dir=str(src_dir / 'settings'), - cli_args=['export', '--' + param, value]) == 0 + cli_call('serve', '--engine', 'starlette', '--server', 'foobar:4545') == 0 + + assert func.called == 1 + assert func.last_kwargs['host'] == 'foobar' + assert func.last_kwargs['port'] == 4545 + + +def test_cli_serve_starlette_custom_server_bad_port(cli_call, mock_func_factory): + pytest.importorskip("starlette") + mod = pytest.importorskip("uvicorn") + func = mock_func_factory(mod, "run") + cli_call('serve', '--engine', 'starlette', '--server', 'foobar:45:45') == 1 + + +@pytest.mark.parametrize("engine", ['falcon', 'starlette']) +def test_cli_serve_uvicorn_based(cli_call, engine, mock_func_factory): + pytest.importorskip(engine) + mod = pytest.importorskip("uvicorn") + func = mock_func_factory(mod, "run") + + cli_call('serve', '--engine', engine) == 0 + + assert func.called == 1 + assert func.last_kwargs['host'] == '127.0.0.1' + assert func.last_kwargs['port'] == 8088 class TestCliWithDb: @@ -108,8 +110,8 @@ class TestCliWithDb: def test_freeze_command(self, mock_func_factory): - mock_drop = mock_func_factory(nominatim.tools.freeze, 'drop_update_tables') - mock_flatnode = mock_func_factory(nominatim.tools.freeze, 'drop_flatnode_file') + mock_drop = mock_func_factory(nominatim_db.tools.freeze, 'drop_update_tables') + mock_flatnode = mock_func_factory(nominatim_db.tools.freeze, 'drop_flatnode_file') assert self.call_nominatim('freeze') == 0 @@ -125,17 +127,19 @@ class TestCliWithDb: def test_index_command(self, mock_func_factory, table_factory, params, do_bnds, do_ranks): table_factory('import_status', 'indexed bool') - bnd_mock = mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_boundaries') - rank_mock = mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_by_rank') + bnd_mock = mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_boundaries') + rank_mock = mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_by_rank') + postcode_mock = mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_postcodes') assert self.call_nominatim('index', *params) == 0 assert bnd_mock.called == do_bnds assert rank_mock.called == do_ranks + assert postcode_mock.called == do_ranks def test_special_phrases_wiki_command(self, mock_func_factory): - func = mock_func_factory(nominatim.clicmd.special_phrases.SPImporter, 'import_phrases') + func = mock_func_factory(nominatim_db.clicmd.special_phrases.SPImporter, 'import_phrases') self.call_nominatim('special-phrases', '--import-from-wiki', '--no-replace') @@ -143,7 +147,7 @@ class TestCliWithDb: def test_special_phrases_csv_command(self, src_dir, mock_func_factory): - func = mock_func_factory(nominatim.clicmd.special_phrases.SPImporter, 'import_phrases') + func = mock_func_factory(nominatim_db.clicmd.special_phrases.SPImporter, 'import_phrases') testdata = src_dir / 'test' / 'testdb' csv_path = str((testdata / 'full_en_phrases_test.csv').resolve())