safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

use data paths from new nominatim.paths

Browse Source
This commit is contained in:
Sarah Hoffmann
2022-11-26 22:00:43 +01:00
parent 20f56dfc77
commit 2abe9e6fd9
19 changed files with 80 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/python/cli/conftest.py
View File

@@ -53,11 +53,7 @@ def cli_call(src_dir):
def _call_nominatim(*args):
return 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='/usr/bin/php-cgi',
sqllib_dir=str(src_dir / 'lib-sql'),
config_dir=str(src_dir / 'settings'),
cli_args=args)
return _call_nominatim

8
test/python/cli/test_cli.py
View File

@@ -82,19 +82,17 @@ def test_cli_export_command(cli_call, mock_run_legacy):
('restrict-to-osm-way', '727'),
('restrict-to-osm-relation', '197532')
])
def test_export_parameters(src_dir, tmp_path, param, value):
def test_export_parameters(src_dir, tmp_path, param, value, monkeypatch):
(tmp_path / 'admin').mkdir()
(tmp_path / 'admin' / 'export.php').write_text(f"""<?php
exit(strpos(implode(' ', $_SERVER['argv']), '--{param} {value}') >= 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',
phplib_dir=str(tmp_path),
data_dir=str(src_dir / 'data'),
phpcgi_path='/usr/bin/php-cgi',
sqllib_dir=str(src_dir / 'lib-sql'),
config_dir=str(src_dir / 'settings'),
cli_args=['export', '--' + param, value]) == 0

3
test/python/cli/test_cmd_replication.py
View File

@@ -15,6 +15,7 @@ import pytest
import nominatim.cli
import nominatim.indexer.indexer
import nominatim.tools.replication
import nominatim.tools.refresh
from nominatim.db import status
@pytest.fixture
@@ -107,7 +108,7 @@ class TestCliReplication:
def test_replication_update_once_no_index(self, update_mock):
assert self.call_nominatim('--once', '--no-index') == 0
assert str(update_mock.last_args[1]['osm2pgsql']) == 'OSM2PGSQL NOT AVAILABLE'
assert str(update_mock.last_args[1]['osm2pgsql']).endswith('OSM2PGSQL NOT AVAILABLE')
def test_replication_update_custom_osm2pgsql(self, monkeypatch, update_mock):