hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-14 18:37:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

split cli.py by subcommands

Browse Source 
Reduces file size below 1000 lines.
This commit is contained in:
Sarah Hoffmann
2021-02-08 17:23:05 +01:00
parent a759c5b75b
commit 195f9f5ef3
8 changed files with 610 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/python/test_cli.py
View File

@@ -11,6 +11,8 @@ import pytest
import time
import nominatim.cli
import nominatim.clicmd.api
import nominatim.clicmd.refresh
import nominatim.indexer.indexer
import nominatim.tools.refresh
import nominatim.tools.replication
@@ -45,12 +47,6 @@ def mock_run_legacy(monkeypatch):
monkeypatch.setattr(nominatim.cli, 'run_legacy_script', mock)
return mock
@pytest.fixture
def mock_run_api(monkeypatch):
mock = MockParamCapture()
monkeypatch.setattr(nominatim.cli, 'run_api_script', mock)
return mock
def test_cli_help(capsys):
""" Running nominatim tool without arguments prints help.
@@ -110,7 +106,10 @@ def test_index_command(monkeypatch, temp_db_cursor, params, do_bnds, do_ranks):
('importance', ('update.php', '--recompute-importance')),
('website', ('setup.php', '--setup-website')),
])
def test_refresh_legacy_command(mock_run_legacy, temp_db, command, params):
def test_refresh_legacy_command(monkeypatch, temp_db, command, params):
mock_run_legacy = MockParamCapture()
monkeypatch.setattr(nominatim.clicmd.refresh, 'run_legacy_script', mock_run_legacy)
assert 0 == call_nominatim('refresh', '--' + command)
assert mock_run_legacy.called == 1
@@ -131,7 +130,10 @@ def test_refresh_command(monkeypatch, temp_db, command, func):
assert func_mock.called == 1
def test_refresh_importance_computed_after_wiki_import(mock_run_legacy, temp_db):
def test_refresh_importance_computed_after_wiki_import(monkeypatch, temp_db):
mock_run_legacy = MockParamCapture()
monkeypatch.setattr(nominatim.clicmd.refresh, 'run_legacy_script', mock_run_legacy)
assert 0 == call_nominatim('refresh', '--importance', '--wiki-data')
assert mock_run_legacy.called == 2
@@ -233,7 +235,10 @@ def test_serve_command(monkeypatch):
('details', '--place_id', '10001'),
('status',)
])
def test_api_commands_simple(mock_run_api, params):
def test_api_commands_simple(monkeypatch, params):
mock_run_api = MockParamCapture()
monkeypatch.setattr(nominatim.clicmd.api, 'run_api_script', mock_run_api)
assert 0 == call_nominatim(*params)
assert mock_run_api.called == 1