X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e629a175ed0a1c54398622251f56d56baeef768f..a33f2c0f5ba43df533b6e137f9151fe67feb20a1:/test/python/test_config.py?ds=sidebyside

diff --git a/test/python/test_config.py b/test/python/test_config.py
index 4578be13..d6911957 100644
--- a/test/python/test_config.py
+++ b/test/python/test_config.py
@@ -2,7 +2,6 @@
 Test for loading dotenv configuration.
 """
 from pathlib import Path
-import tempfile
 
 import pytest
 
@@ -17,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):