X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9afebddb16b09e09fa9a74624dcd79475b476f10..4a2873617dcbaf58ff6135aa7d8dcb115c0cc5ba:/test/python/test_tools_exec_utils.py?ds=inline diff --git a/test/python/test_tools_exec_utils.py b/test/python/test_tools_exec_utils.py index ef1b46e2..8f60ac74 100644 --- a/test/python/test_tools_exec_utils.py +++ b/test/python/test_tools_exec_utils.py @@ -23,6 +23,8 @@ def nominatim_env(tmp_phplib_dir, def_config): phplib_dir = tmp_phplib_dir data_dir = Path('data') project_dir = Path('.') + sqllib_dir = Path('lib-sql') + config_dir = Path('settings') module_dir = 'module' osm2pgsql_path = 'osm2pgsql' @@ -103,8 +105,15 @@ def test_run_api_with_extra_env(tmp_project_dir): ### run_osm2pgsql -def test_run_osm2pgsql(): - exec_utils.run_osm2pgsql(dict(osm2pgsql='echo', append=False, flatnode_file=None, - dsn='dbname=foobar', threads=1, osm2pgsql_cache=500, - osm2pgsql_style='./my.style', - import_file='foo.bar')) +def test_run_osm2pgsql(osm2pgsql_options): + osm2pgsql_options['append'] = False + osm2pgsql_options['import_file'] = 'foo.bar' + osm2pgsql_options['tablespaces']['osm_data'] = 'extra' + exec_utils.run_osm2pgsql(osm2pgsql_options) + + +def test_run_osm2pgsql_disable_jit(osm2pgsql_options): + osm2pgsql_options['append'] = True + osm2pgsql_options['import_file'] = 'foo.bar' + osm2pgsql_options['disable_jit'] = True + exec_utils.run_osm2pgsql(osm2pgsql_options)