test: replace raw execute() with fixture code where possible

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

diff --git a/test/python/test_config.py b/test/python/test_config.py
index f9fefeb2215c900279a9bad81d22ecce35ff6a5c..d6911957892dd290ec9fab26aeddcafd929281d1 100644 (file)
--- 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
 Test for loading dotenv configuration.
 """
 from pathlib import Path

-import tempfile

 
 import pytest
 
 from nominatim.config import Configuration
 
 import pytest
 
 from nominatim.config import Configuration

+from nominatim.errors import UsageError

 
 DEFCFG_DIR = Path(__file__) / '..' / '..' / '..' / 'settings'
 
 
 DEFCFG_DIR = Path(__file__) / '..' / '..' / '..' / 'settings'
 


@@ -16,26 +16,25 @@ def test_no_project_dir():
     assert config.DATABASE_WEBUSER == 'www-data'
 
 
     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):
 
 
 def test_get_os_env_add_defaults(monkeypatch):


@@ -123,7 +122,7 @@ def test_get_int_bad_values(monkeypatch, value):
 
     monkeypatch.setenv('NOMINATIM_FOOBAR', value)
 
 
     monkeypatch.setenv('NOMINATIM_FOOBAR', value)
 

-    with pytest.raises(ValueError):
+    with pytest.raises(UsageError):

         config.get_int('FOOBAR')
 
 
         config.get_int('FOOBAR')
 
 


@@ -132,7 +131,7 @@ def test_get_int_empty():
 
     assert config.DATABASE_MODULE_PATH == ''
 
 
     assert config.DATABASE_MODULE_PATH == ''
 

-    with pytest.raises(ValueError):
+    with pytest.raises(UsageError):

         config.get_int('DATABASE_MODULE_PATH')
 
 
         config.get_int('DATABASE_MODULE_PATH')