From 0c023fb4d25c3c94c08197e3c733d11ceb0d9ba1 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 25 Jul 2021 23:44:22 +0200 Subject: [PATCH] adapt cli tests to Python port for add-data --- test/python/test_cli.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/test/python/test_cli.py b/test/python/test_cli.py index 6ba89a0a..bd5182e3 100644 --- a/test/python/test_cli.py +++ b/test/python/test_cli.py @@ -15,6 +15,7 @@ import nominatim.clicmd.admin import nominatim.clicmd.setup import nominatim.indexer.indexer import nominatim.tools.admin +import nominatim.tools.add_osm_data import nominatim.tools.check_database import nominatim.tools.database_import import nominatim.tools.freeze @@ -87,14 +88,20 @@ class TestCli: 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(self, mock_func_factory, name, oid): - mock_run_legacy = mock_func_factory(nominatim.clicmd.add_data, 'run_legacy_script') + @pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc')]) + def test_add_data_file_command(self, mock_func_factory, name, oid): + mock_run_legacy = mock_func_factory(nominatim.tools.add_osm_data, 'add_data_from_file') + assert self.call_nominatim('add-data', '--' + name, str(oid)) == 0 + + assert mock_run_legacy.called == 1 + + + @pytest.mark.parametrize("name,oid", [('node', 12), ('way', 8), ('relation', 32)]) + def test_add_data_object_command(self, mock_func_factory, name, oid): + mock_run_legacy = mock_func_factory(nominatim.tools.add_osm_data, 'add_osm_object') assert self.call_nominatim('add-data', '--' + name, str(oid)) == 0 assert mock_run_legacy.called == 1 - assert mock_run_legacy.last_args == ('update.php', '--import-' + name, oid) def test_serve_command(self, mock_func_factory): -- 2.39.5