hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 21:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up uses of cli.nominatim()

Browse Source 
They should not hand in data paths anymore.
This commit is contained in:
Sarah Hoffmann
2022-11-27 15:27:04 +01:00
parent 2abe9e6fd9
commit 2231401483
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/bdd/steps/nominatim_environment.py
View File

@@ -302,10 +302,6 @@ class NominatimEnvironment:
cli.nominatim(module_dir='', cli.nominatim(module_dir='',
osm2pgsql_path=str(self.build_dir / 'osm2pgsql' / 'osm2pgsql'), osm2pgsql_path=str(self.build_dir / 'osm2pgsql' / 'osm2pgsql'),
phplib_dir=str(self.src_dir / 'lib-php'),
sqllib_dir=str(self.src_dir / 'lib-sql'),
data_dir=str(self.src_dir / 'data'),
config_dir=str(self.src_dir / 'settings'),
cli_args=cmdline, cli_args=cmdline,
phpcgi_path='', phpcgi_path='',
environ=self.test_env) environ=self.test_env)

30
test/python/cli/test_cmd_api.py
View File

@@ -13,14 +13,10 @@ import nominatim.clicmd.api
@pytest.mark.parametrize("endpoint", (('search', 'reverse', 'lookup', 'details', 'status'))) @pytest.mark.parametrize("endpoint", (('search', 'reverse', 'lookup', 'details', 'status')))
def test_no_api_without_phpcgi(src_dir, endpoint): def test_no_api_without_phpcgi(endpoint):
assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE', assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
osm2pgsql_path='OSM2PGSQL NOT AVAILABLE', osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
phplib_dir=str(src_dir / 'lib-php'),
data_dir=str(src_dir / 'data'),
phpcgi_path=None, phpcgi_path=None,
sqllib_dir=str(src_dir / 'lib-sql'),
config_dir=str(src_dir / 'settings'),
cli_args=[endpoint]) == 1 cli_args=[endpoint]) == 1
@@ -36,24 +32,28 @@ def test_no_api_without_phpcgi(src_dir, endpoint):
class TestCliApiCall: class TestCliApiCall:
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def setup_cli_call(self, cli_call): def setup_cli_call(self, params, cli_call, mock_func_factory, tmp_path):
self.call_nominatim = cli_call self.mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script')
def test_api_commands_simple(self, mock_func_factory, params, tmp_path): def _run():
return cli_call(*params, '--project-dir', str(tmp_path))
self.run_nominatim = _run
def test_api_commands_simple(self, tmp_path, params):
(tmp_path / 'website').mkdir() (tmp_path / 'website').mkdir()
(tmp_path / 'website' / (params[0] + '.php')).write_text('') (tmp_path / 'website' / (params[0] + '.php')).write_text('')
mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script')
assert self.call_nominatim(*params, '--project-dir', str(tmp_path)) == 0 assert self.run_nominatim() == 0
assert mock_run_api.called == 1 assert self.mock_run_api.called == 1
assert mock_run_api.last_args[0] == params[0] assert self.mock_run_api.last_args[0] == params[0]
def test_bad_project_idr(self, mock_func_factory, params): def test_bad_project_dir(self):
mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script') assert self.run_nominatim() == 1
assert self.call_nominatim(*params) == 1
QUERY_PARAMS = { QUERY_PARAMS = {
'search': ('--query', 'somewhere'), 'search': ('--query', 'somewhere'),