From 4f59644cc2ef6da59f96bee2efdd722d943677b1 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 14 Apr 2022 14:52:13 +0200 Subject: [PATCH] add tests for new data invalidation functions --- nominatim/cli.py | 5 +++- nominatim/clicmd/refresh.py | 5 ++-- test/python/cli/test_cmd_api.py | 17 ++++++----- test/python/cli/test_cmd_refresh.py | 21 ++++++++++++++ test/python/tools/test_refresh.py | 44 +++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 12 deletions(-) diff --git a/nominatim/cli.py b/nominatim/cli.py index 0a3bd2b0..315c1cfe 100644 --- a/nominatim/cli.py +++ b/nominatim/cli.py @@ -70,7 +70,10 @@ class CommandlineParser: appropriate subcommand. """ args = NominatimArgs() - self.parser.parse_args(args=kwargs.get('cli_args'), namespace=args) + try: + self.parser.parse_args(args=kwargs.get('cli_args'), namespace=args) + except SystemExit: + return 1 if args.subcommand is None: self.parser.print_help() diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py index 4fbdfebb..ecc7498e 100644 --- a/nominatim/clicmd/refresh.py +++ b/nominatim/clicmd/refresh.py @@ -7,6 +7,7 @@ """ Implementation of 'refresh' subcommand. """ +from argparse import ArgumentTypeError import logging from pathlib import Path @@ -24,7 +25,7 @@ def _parse_osm_object(obj): Raises an ArgumentError if the format is not recognized. """ if len(obj) < 2 or obj[0].lower() not in 'nrw' or not obj[1:].isdigit(): - raise ArgumentError("Expect OSM object id of form [N|W|R].") + raise ArgumentTypeError("Cannot parse OSM ID. Expect format: [N|W|R].") return (obj[0].upper(), int(obj[1:])) @@ -79,7 +80,7 @@ class UpdateRefresh: help='Enable debug warning statements in functions') - def run(self, args): + def run(self, args): #pylint: disable=too-many-branches from ..tools import refresh, postcodes from ..indexer.indexer import Indexer diff --git a/test/python/cli/test_cmd_api.py b/test/python/cli/test_cmd_api.py index f24125c2..80248ac7 100644 --- a/test/python/cli/test_cmd_api.py +++ b/test/python/cli/test_cmd_api.py @@ -14,15 +14,14 @@ import nominatim.clicmd.api @pytest.mark.parametrize("endpoint", (('search', 'reverse', 'lookup', 'details', 'status'))) def test_no_api_without_phpcgi(src_dir, endpoint): - with pytest.raises(SystemExit): - nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE', - osm2pgsql_path='OSM2PGSQL NOT AVAILABLE', - phplib_dir=str(src_dir / 'lib-php'), - data_dir=str(src_dir / 'data'), - phpcgi_path=None, - sqllib_dir=str(src_dir / 'lib-sql'), - config_dir=str(src_dir / 'settings'), - cli_args=[endpoint]) + assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE', + osm2pgsql_path='OSM2PGSQL NOT AVAILABLE', + phplib_dir=str(src_dir / 'lib-php'), + data_dir=str(src_dir / 'data'), + phpcgi_path=None, + sqllib_dir=str(src_dir / 'lib-sql'), + config_dir=str(src_dir / 'settings'), + cli_args=[endpoint]) == 1 @pytest.mark.parametrize("params", [('search', '--query', 'new'), diff --git a/test/python/cli/test_cmd_refresh.py b/test/python/cli/test_cmd_refresh.py index b6281c7a..7f44765b 100644 --- a/test/python/cli/test_cmd_refresh.py +++ b/test/python/cli/test_cmd_refresh.py @@ -82,3 +82,24 @@ class TestRefresh: assert self.call_nominatim('refresh', '--importance', '--wiki-data') == 0 assert calls == ['import', 'update'] + + @pytest.mark.parametrize('params', [('--data-object', 'w234'), + ('--data-object', 'N23', '--data-object', 'N24'), + ('--data-area', 'R7723'), + ('--data-area', 'r7723', '--data-area', 'r2'), + ('--data-area', 'R9284425', '--data-object', 'n1234567894567')]) + def test_refresh_objects(self, params, mock_func_factory): + func_mock = mock_func_factory(nominatim.tools.refresh, 'invalidate_osm_object') + + assert self.call_nominatim('refresh', *params) == 0 + + assert func_mock.called == len(params)/2 + + + @pytest.mark.parametrize('func', ('--data-object', '--data-area')) + @pytest.mark.parametrize('param', ('234', 'a55', 'R 453', 'Rel')) + def test_refresh_objects_bad_param(self, func, param, mock_func_factory): + func_mock = mock_func_factory(nominatim.tools.refresh, 'invalidate_osm_object') + + self.call_nominatim('refresh', func, param) == 1 + assert func_mock.called == 0 diff --git a/test/python/tools/test_refresh.py b/test/python/tools/test_refresh.py index cbe7f7bd..ac52aa36 100644 --- a/test/python/tools/test_refresh.py +++ b/test/python/tools/test_refresh.py @@ -39,3 +39,47 @@ def test_recompute_importance(placex_table, table_factory, temp_db_conn, temp_db AS $$ SELECT 0.1::float, 'foo'::text $$ LANGUAGE SQL""") refresh.recompute_importance(temp_db_conn) + + +@pytest.mark.parametrize('osm_type', ('N', 'W', 'R')) +def test_invalidate_osm_object_simple(placex_table, osm_type, temp_db_conn, temp_db_cursor): + placex_table.add(osm_type=osm_type, osm_id=57283) + + refresh.invalidate_osm_object(osm_type, 57283, temp_db_conn, recursive=False) + temp_db_conn.commit() + + assert 2 == temp_db_cursor.scalar("""SELECT indexed_status FROM placex + WHERE osm_type = %s and osm_id = %s""", + (osm_type, 57283)) + + +def test_invalidate_osm_object_nonexisting_simple(placex_table, temp_db_conn, temp_db_cursor): + placex_table.add(osm_type='W', osm_id=57283) + + refresh.invalidate_osm_object('N', 57283, temp_db_conn, recursive=False) + temp_db_conn.commit() + + assert 0 == temp_db_cursor.scalar("""SELECT count(*) FROM placex + WHERE indexed_status > 0""") + + +@pytest.mark.parametrize('osm_type', ('N', 'W', 'R')) +def test_invalidate_osm_object_recursive(placex_table, osm_type, temp_db_conn, temp_db_cursor): + placex_table.add(osm_type=osm_type, osm_id=57283) + + temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION place_force_update(placeid BIGINT) + RETURNS BOOLEAN AS $$ + BEGIN + UPDATE placex SET indexed_status = 522 + WHERE place_id = placeid; + RETURN TRUE; + END; + $$ + LANGUAGE plpgsql;""") + + refresh.invalidate_osm_object(osm_type, 57283, temp_db_conn) + temp_db_conn.commit() + + assert 522 == temp_db_cursor.scalar("""SELECT indexed_status FROM placex + WHERE osm_type = %s and osm_id = %s""", + (osm_type, 57283))