safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

test: use src_dir fixture instead of self-computed paths

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-05-19 16:03:54 +02:00
parent c06a1d007a
commit f93d0fa957
8 changed files with 424 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
test/python/test_config.py
View File

@@ -8,59 +8,67 @@ import pytest
from nominatim.config import Configuration
from nominatim.errors import UsageError
DEFCFG_DIR = Path(__file__) / '..' / '..' / '..' / 'settings'
@pytest.fixture
def make_config(src_dir):
""" Create a configuration object from the given project directory.
"""
def _mk_config(project_dir=None):
return Configuration(project_dir, src_dir / 'settings')
def test_no_project_dir():
config = Configuration(None, DEFCFG_DIR)
return _mk_config
def test_no_project_dir(make_config):
config = make_config()
assert config.DATABASE_WEBUSER == 'www-data'
@pytest.mark.parametrize("val", ('apache', '"apache"'))
def test_prefer_project_setting_over_default(val, tmp_path):
def test_prefer_project_setting_over_default(make_config, val, tmp_path):
envfile = tmp_path / '.env'
envfile.write_text('NOMINATIM_DATABASE_WEBUSER={}\n'.format(val))
config = Configuration(Path(tmp_path), DEFCFG_DIR)
config = make_config(tmp_path)
assert config.DATABASE_WEBUSER == 'apache'
def test_prefer_os_environ_over_project_setting(monkeypatch, tmp_path):
def test_prefer_os_environ_over_project_setting(make_config, monkeypatch, tmp_path):
envfile = tmp_path / '.env'
envfile.write_text('NOMINATIM_DATABASE_WEBUSER=apache\n')
monkeypatch.setenv('NOMINATIM_DATABASE_WEBUSER', 'nobody')
config = Configuration(Path(tmp_path), DEFCFG_DIR)
config = make_config(tmp_path)
assert config.DATABASE_WEBUSER == 'nobody'
def test_get_os_env_add_defaults(monkeypatch):
config = Configuration(None, DEFCFG_DIR)
def test_get_os_env_add_defaults(make_config, monkeypatch):
config = make_config()
monkeypatch.delenv('NOMINATIM_DATABASE_WEBUSER', raising=False)
assert config.get_os_env()['NOMINATIM_DATABASE_WEBUSER'] == 'www-data'
def test_get_os_env_prefer_os_environ(monkeypatch):
config = Configuration(None, DEFCFG_DIR)
def test_get_os_env_prefer_os_environ(make_config, monkeypatch):
config = make_config()
monkeypatch.setenv('NOMINATIM_DATABASE_WEBUSER', 'nobody')
assert config.get_os_env()['NOMINATIM_DATABASE_WEBUSER'] == 'nobody'
def test_get_libpq_dsn_convert_default():
config = Configuration(None, DEFCFG_DIR)
def test_get_libpq_dsn_convert_default(make_config):
config = make_config()
assert config.get_libpq_dsn() == 'dbname=nominatim'
def test_get_libpq_dsn_convert_php(monkeypatch):
config = Configuration(None, DEFCFG_DIR)
def test_get_libpq_dsn_convert_php(make_config, monkeypatch):
config = make_config()
monkeypatch.setenv('NOMINATIM_DATABASE_DSN',
'pgsql:dbname=gis;password=foo;host=localhost')
@@ -71,8 +79,8 @@ def test_get_libpq_dsn_convert_php(monkeypatch):
@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)
def test_get_libpq_dsn_convert_php_special_chars(make_config, monkeypatch, val, expect):
config = make_config()
monkeypatch.setenv('NOMINATIM_DATABASE_DSN',
'pgsql:dbname=gis;password={}'.format(val))
@@ -80,8 +88,8 @@ def test_get_libpq_dsn_convert_php_special_chars(monkeypatch, val, expect):
assert config.get_libpq_dsn() == "dbname=gis password={}".format(expect)
def test_get_libpq_dsn_convert_libpq(monkeypatch):
config = Configuration(None, DEFCFG_DIR)
def test_get_libpq_dsn_convert_libpq(make_config, monkeypatch):
config = make_config()
monkeypatch.setenv('NOMINATIM_DATABASE_DSN',
'host=localhost dbname=gis password=foo')
@@ -92,15 +100,15 @@ def test_get_libpq_dsn_convert_libpq(monkeypatch):
@pytest.mark.parametrize("value,result",
[(x, True) for x in ('1', 'true', 'True', 'yes', 'YES')] +
[(x, False) for x in ('0', 'false', 'no', 'NO', 'x')])
def test_get_bool(monkeypatch, value, result):
config = Configuration(None, DEFCFG_DIR)
def test_get_bool(make_config, monkeypatch, value, result):
config = make_config()
monkeypatch.setenv('NOMINATIM_FOOBAR', value)
assert config.get_bool('FOOBAR') == result
def test_get_bool_empty():
config = Configuration(None, DEFCFG_DIR)
def test_get_bool_empty(make_config):
config = make_config()
assert config.DATABASE_MODULE_PATH == ''
assert config.get_bool('DATABASE_MODULE_PATH') == False
@@ -108,8 +116,8 @@ def test_get_bool_empty():
@pytest.mark.parametrize("value,result", [('0', 0), ('1', 1),
('85762513444', 85762513444)])
def test_get_int_success(monkeypatch, value, result):
config = Configuration(None, DEFCFG_DIR)
def test_get_int_success(make_config, monkeypatch, value, result):
config = make_config()
monkeypatch.setenv('NOMINATIM_FOOBAR', value)
@@ -117,8 +125,8 @@ def test_get_int_success(monkeypatch, value, result):
@pytest.mark.parametrize("value", ['1b', 'fg', '0x23'])
def test_get_int_bad_values(monkeypatch, value):
config = Configuration(None, DEFCFG_DIR)
def test_get_int_bad_values(make_config, monkeypatch, value):
config = make_config()
monkeypatch.setenv('NOMINATIM_FOOBAR', value)
@@ -126,8 +134,8 @@ def test_get_int_bad_values(monkeypatch, value):
config.get_int('FOOBAR')
def test_get_int_empty():
config = Configuration(None, DEFCFG_DIR)
def test_get_int_empty(make_config):
config = make_config()
assert config.DATABASE_MODULE_PATH == ''
@@ -135,8 +143,8 @@ def test_get_int_empty():
config.get_int('DATABASE_MODULE_PATH')
def test_get_import_style_intern(monkeypatch):
config = Configuration(None, DEFCFG_DIR)
def test_get_import_style_intern(make_config, monkeypatch):
config = make_config()
monkeypatch.setenv('NOMINATIM_IMPORT_STYLE', 'street')
@@ -146,8 +154,8 @@ def test_get_import_style_intern(monkeypatch):
@pytest.mark.parametrize("value", ['custom', '/foo/bar.stye'])
def test_get_import_style_intern(monkeypatch, value):
config = Configuration(None, DEFCFG_DIR)
def test_get_import_style_intern(make_config, monkeypatch, value):
config = make_config()
monkeypatch.setenv('NOMINATIM_IMPORT_STYLE', value)