Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / test_tools_exec_utils.py

diff --git a/test/python/test_tools_exec_utils.py b/test/python/test_tools_exec_utils.py
index a4eef61f5b24315f76bcfd789863e3f1d3a3a205..8f60ac7404e0c05e1d3ebf51e080477f9fb269da 100644 (file)
--- 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('.')
         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'
 
         module_dir = 'module'
         osm2pgsql_path = 'osm2pgsql'
 


@@ -63,8 +65,8 @@ def test_run_legacy_return_dont_throw_on_success(nominatim_env, test_script):
     assert 0 == exec_utils.run_legacy_script(fname, nominatim_env=nominatim_env,
                                              throw_on_fail=True)
 
     assert 0 == exec_utils.run_legacy_script(fname, nominatim_env=nominatim_env,
                                              throw_on_fail=True)
 

-def test_run_legacy_use_given__module_path(nominatim_env, test_script):
-    fname = test_script("exit($_SERVER['NOMINATIM_DATABASE_MODULE_PATH'] == 'module' ? 0 : 23);")
+def test_run_legacy_use_given_module_path(nominatim_env, test_script):
+    fname = test_script("exit($_SERVER['NOMINATIM_DATABASE_MODULE_PATH'] == '' ? 0 : 23);")

 
     assert 0 == exec_utils.run_legacy_script(fname, nominatim_env=nominatim_env)
 
 
     assert 0 == exec_utils.run_legacy_script(fname, nominatim_env=nominatim_env)
 


@@ -99,3 +101,19 @@ def test_run_api_with_extra_env(tmp_project_dir):
     extra_env = dict(SCRIPT_FILENAME=str(tmp_project_dir / 'website' / 'test.php'))
     assert 0 == exec_utils.run_api_script('badname', tmp_project_dir,
                                           extra_env=extra_env)
     extra_env = dict(SCRIPT_FILENAME=str(tmp_project_dir / 'website' / 'test.php'))
     assert 0 == exec_utils.run_api_script('badname', tmp_project_dir,
                                           extra_env=extra_env)

+
+
+### run_osm2pgsql
+
+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)