forked from hans/Nominatim
remove code for setting osm2pgsql via config.lib_dir
With the internal osm2pgsql gone, configuration of the binary location via settings is the only option left that makes sense.
This commit is contained in:
@@ -16,8 +16,7 @@ import nominatim_db.cli
|
||||
def run_export(tmp_path, capsys):
|
||||
def _exec(args):
|
||||
cli_args = ['export', '--project-dir', str(tmp_path)] + args
|
||||
assert 0 == nominatim_db.cli.nominatim(osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
|
||||
cli_args=cli_args)
|
||||
assert 0 == nominatim_db.cli.nominatim(cli_args=cli_args)
|
||||
return capsys.readouterr().out.split('\r\n')
|
||||
|
||||
return _exec
|
||||
|
||||
@@ -29,6 +29,5 @@ def setup_database_with_context(apiobj, table_factory):
|
||||
|
||||
@pytest.mark.parametrize('args', [['--search-only'], ['--reverse-only']])
|
||||
def test_warm_all(tmp_path, args):
|
||||
assert 0 == nominatim_db.cli.nominatim(osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
|
||||
cli_args=['admin', '--project-dir', str(tmp_path),
|
||||
assert 0 == nominatim_db.cli.nominatim(cli_args=['admin', '--project-dir', str(tmp_path),
|
||||
'--warm'] + args)
|
||||
|
||||
Reference in New Issue
Block a user