From 90a5d2301610142994e75311be8ef9ca4643aafb Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 1 Mar 2021 09:24:04 +0100 Subject: [PATCH] use tmp_path fixture in config tests --- test/python/test_config.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/test/python/test_config.py b/test/python/test_config.py index 4578be13..81f13ffd 100644 --- a/test/python/test_config.py +++ b/test/python/test_config.py @@ -17,26 +17,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): -- 2.45.2