X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8a0e3e2f3d9bce87725a6e08dcc90a072a17995c..8e5a19b39209f20f41b7bd10ff7dbcdb8a3dcb9c:/test/python/config/test_config.py diff --git a/test/python/config/test_config.py b/test/python/config/test_config.py index a9cbb48d..5c9393ec 100644 --- a/test/python/config/test_config.py +++ b/test/python/config/test_config.py @@ -1,8 +1,8 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. """ Test for loading dotenv configuration. @@ -10,27 +10,27 @@ Test for loading dotenv configuration. from pathlib import Path import pytest -from nominatim.config import Configuration, flatten_config_list -from nominatim.errors import UsageError +from nominatim_db.config import Configuration, flatten_config_list +from nominatim_db.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