X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bf1f6a997ccdb115f7c77ab8ded34e80dca7abeb..332de72045ec0f52c322a595a35a1306ea8a5efb:/test/python/cli/test_cli.py?ds=inline diff --git a/test/python/cli/test_cli.py b/test/python/cli/test_cli.py index d0e3307e..998bccb4 100644 --- a/test/python/cli/test_cli.py +++ b/test/python/cli/test_cli.py @@ -8,7 +8,7 @@ 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 @@ -63,16 +63,7 @@ def test_cli_add_data_tiger_data(cli_call, cli_tokenizer_mock, mock_func_factory def test_cli_serve_php(cli_call, mock_func_factory): func = mock_func_factory(nominatim.cli, 'run_php_server') - cli_call('serve') == 0 - - assert func.called == 1 - - -def test_cli_serve_sanic(cli_call, mock_func_factory): - mod = pytest.importorskip("sanic") - func = mock_func_factory(mod.Sanic, "run") - - cli_call('serve', '--engine', 'sanic') == 0 + cli_call('serve', '--engine', 'php') == 0 assert func.called == 1 @@ -109,35 +100,6 @@ def test_cli_serve_uvicorn_based(cli_call, engine, mock_func_factory): assert func.last_kwargs['host'] == '127.0.0.1' assert func.last_kwargs['port'] == 8088 -def test_cli_export_command(cli_call, mock_run_legacy): - assert cli_call('export', '--output-all-postcodes') == 0 - - 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, monkeypatch): - (tmp_path / 'admin').mkdir() - (tmp_path / 'admin' / 'export.php').write_text(f"""= 0 ? 0 : 10); - """) - - monkeypatch.setattr(nominatim.paths, 'PHPLIB_DIR', tmp_path) - - assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE', - osm2pgsql_path='OSM2PGSQL NOT AVAILABLE', - phpcgi_path='/usr/bin/php-cgi', - cli_args=['export', '--' + param, value]) == 0 - - class TestCliWithDb: