X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/12a3d51bcc7b1a2aa5eb17c2b2dd36b71ae5610c..9a84adef5981d1a8357fd1775358742aae83867b:/test/python/config/test_config.py diff --git a/test/python/config/test_config.py b/test/python/config/test_config.py index a9cbb48d..ff8b587d 100644 --- a/test/python/config/test_config.py +++ b/test/python/config/test_config.py @@ -14,23 +14,23 @@ from nominatim.config import Configuration, flatten_config_list from nominatim.errors import UsageError @pytest.fixture -def make_config(src_dir): +def make_config(): """ Create a configuration object from the given project directory. """ def _mk_config(project_dir=None): - return Configuration(project_dir, src_dir / 'settings') + return Configuration(project_dir) return _mk_config @pytest.fixture -def make_config_path(src_dir, tmp_path): +def make_config_path(tmp_path): """ Create a configuration object with project and config directories in a temporary directory. """ def _mk_config(): (tmp_path / 'project').mkdir() (tmp_path / 'config').mkdir() - conf = Configuration(tmp_path / 'project', src_dir / 'settings') + conf = Configuration(tmp_path / 'project') conf.config_dir = tmp_path / 'config' return conf @@ -222,7 +222,7 @@ def test_get_import_style_intern(make_config, src_dir, monkeypatch): monkeypatch.setenv('NOMINATIM_IMPORT_STYLE', 'street') - expected = src_dir / 'settings' / 'import-street.style' + expected = src_dir / 'settings' / 'import-street.lua' assert config.get_import_style_file() == expected