X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5b46fcad8ec166d1b8e35cfbc58405b71e27caa3..db663dd92f1d2cc1b34f1260ce6c190abcd50c76:/test/python/test_config.py

diff --git a/test/python/test_config.py b/test/python/test_config.py
index 064f71ba..d6911957 100644
--- a/test/python/test_config.py
+++ b/test/python/test_config.py
@@ -2,11 +2,11 @@
 Test for loading dotenv configuration.
 """
 from pathlib import Path
-import tempfile
 
 import pytest
 
 from nominatim.config import Configuration
+from nominatim.errors import UsageError
 
 DEFCFG_DIR = Path(__file__) / '..' / '..' / '..' / 'settings'
 
@@ -16,26 +16,25 @@ def test_no_project_dir():
     assert config.DATABASE_WEBUSER == 'www-data'
 
 
-def test_prefer_project_setting_over_default():
-    with tempfile.TemporaryDirectory() as project_dir:
-        with open(project_dir + '/.env', 'w') as envfile:
-            envfile.write('NOMINATIM_DATABASE_WEBUSER=apache\n')
+@pytest.mark.parametrize("val", ('apache', '"apache"'))
+def test_prefer_project_setting_over_default(val, tmp_path):
+    envfile = tmp_path / '.env'
+    envfile.write_text('NOMINATIM_DATABASE_WEBUSER={}\n'.format(val))
 
-        config = Configuration(Path(project_dir), DEFCFG_DIR)
+    config = Configuration(Path(tmp_path), DEFCFG_DIR)
 
-        assert config.DATABASE_WEBUSER == 'apache'
+    assert config.DATABASE_WEBUSER == 'apache'
 
 
-def test_prefer_os_environ_over_project_setting(monkeypatch):
-    with tempfile.TemporaryDirectory() as project_dir:
-        with open(project_dir + '/.env', 'w') as envfile:
-            envfile.write('NOMINATIM_DATABASE_WEBUSER=apache\n')
+def test_prefer_os_environ_over_project_setting(monkeypatch, tmp_path):
+    envfile = tmp_path / '.env'
+    envfile.write_text('NOMINATIM_DATABASE_WEBUSER=apache\n')
 
-        monkeypatch.setenv('NOMINATIM_DATABASE_WEBUSER', 'nobody')
+    monkeypatch.setenv('NOMINATIM_DATABASE_WEBUSER', 'nobody')
 
-        config = Configuration(Path(project_dir), DEFCFG_DIR)
+    config = Configuration(Path(tmp_path), DEFCFG_DIR)
 
-        assert config.DATABASE_WEBUSER == 'nobody'
+    assert config.DATABASE_WEBUSER == 'nobody'
 
 
 def test_get_os_env_add_defaults(monkeypatch):
@@ -69,6 +68,18 @@ def test_get_libpq_dsn_convert_php(monkeypatch):
     assert config.get_libpq_dsn() == 'dbname=gis password=foo host=localhost'
 
 
+@pytest.mark.parametrize("val,expect", [('foo bar', "'foo bar'"),
+                                        ("xy'z", "xy\\'z"),
+                                       ])
+def test_get_libpq_dsn_convert_php_special_chars(monkeypatch, val, expect):
+    config = Configuration(None, DEFCFG_DIR)
+
+    monkeypatch.setenv('NOMINATIM_DATABASE_DSN',
+                       'pgsql:dbname=gis;password={}'.format(val))
+
+    assert config.get_libpq_dsn() == "dbname=gis password={}".format(expect)
+
+
 def test_get_libpq_dsn_convert_libpq(monkeypatch):
     config = Configuration(None, DEFCFG_DIR)
 
@@ -93,3 +104,51 @@ def test_get_bool_empty():
 
     assert config.DATABASE_MODULE_PATH == ''
     assert config.get_bool('DATABASE_MODULE_PATH') == False
+
+
+@pytest.mark.parametrize("value,result", [('0', 0), ('1', 1),
+                                          ('85762513444', 85762513444)])
+def test_get_int_success(monkeypatch, value, result):
+    config = Configuration(None, DEFCFG_DIR)
+
+    monkeypatch.setenv('NOMINATIM_FOOBAR', value)
+
+    assert config.get_int('FOOBAR') == result
+
+
+@pytest.mark.parametrize("value", ['1b', 'fg', '0x23'])
+def test_get_int_bad_values(monkeypatch, value):
+    config = Configuration(None, DEFCFG_DIR)
+
+    monkeypatch.setenv('NOMINATIM_FOOBAR', value)
+
+    with pytest.raises(UsageError):
+        config.get_int('FOOBAR')
+
+
+def test_get_int_empty():
+    config = Configuration(None, DEFCFG_DIR)
+
+    assert config.DATABASE_MODULE_PATH == ''
+
+    with pytest.raises(UsageError):
+        config.get_int('DATABASE_MODULE_PATH')
+
+
+def test_get_import_style_intern(monkeypatch):
+    config = Configuration(None, DEFCFG_DIR)
+
+    monkeypatch.setenv('NOMINATIM_IMPORT_STYLE', 'street')
+
+    expected = DEFCFG_DIR / 'import-street.style'
+
+    assert config.get_import_style_file() == expected
+
+
+@pytest.mark.parametrize("value", ['custom', '/foo/bar.stye'])
+def test_get_import_style_intern(monkeypatch, value):
+    config = Configuration(None, DEFCFG_DIR)
+
+    monkeypatch.setenv('NOMINATIM_IMPORT_STYLE', value)
+
+    assert str(config.get_import_style_file()) == value