Added test and removed runlegacyscript

This commit is contained in:
Darkshredder 2021-03-10 17:18:12 +05:30
parent 64128b699a
commit ccfad57fca
3 changed files with 31 additions and 3 deletions

View File

@ -13,6 +13,7 @@ from .tools.exec_utils import run_legacy_script, run_php_server
from .errors import UsageError
from . import clicmd
from .clicmd.args import NominatimArgs
from .tools import tiger_data
LOG = logging.getLogger()
@ -166,8 +167,11 @@ class UpdateAddData:
@staticmethod
def run(args):
if args.tiger_data:
os.environ['NOMINATIM_TIGER_DATA_PATH'] = args.tiger_data
return run_legacy_script('setup.php', '--import-tiger-data', nominatim_env=args)
return tiger_data.add_tiger_data(args.config.get_libpq_dsn(),
args.tiger_data,
args.threads or 1,
args.config,
args.sqllib_dir)
params = ['update.php']
if args.file:

View File

@ -65,7 +65,6 @@ def test_cli_help(capsys):
@pytest.mark.parametrize("command,script", [
(('special-phrases',), 'specialphrases'),
(('add-data', '--tiger-data', 'tiger'), 'setup'),
(('add-data', '--file', 'foo.osm'), 'update'),
(('export',), 'export')
])

View File

@ -0,0 +1,25 @@
"""
Test for tiger data function
"""
from pathlib import Path
import pytest
from nominatim.tools import tiger_data, database_import
@pytest.mark.parametrize("threads", (1, 5))
def test_add_tiger_data(dsn, src_dir, def_config, monkeypatch,tmp_path,
temp_db_cursor, threads, temp_db):
monkeypatch.setenv('NOMINATIM_DATABASE_MODULE_PATH', '.')
temp_db_cursor.execute('CREATE EXTENSION hstore')
temp_db_cursor.execute('CREATE EXTENSION postgis')
temp_db_cursor.execute('CREATE TABLE place (id INT)')
database_import.import_base_data('dbname=' + temp_db, src_dir / 'data',
ignore_partitions=False)
sqlfile = tmp_path / '1010.sql'
sqlfile.write_text("""INSERT INTO place values (1)""")
tiger_data.add_tiger_data(dsn, str(tmp_path), threads, def_config, src_dir / 'lib-sql')
assert temp_db_cursor.table_rows('place') == 1