From c06f353f558c746e87112f6cae7d6ae4857da14a Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 29 Nov 2023 14:06:41 +0100 Subject: Simplify _create_mock_configuration_scopes (#41318) --- lib/spack/spack/test/conftest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index fb7608a56b..6cf4d7375a 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -720,13 +720,13 @@ def configuration_dir(tmpdir_factory, linux_os): def _create_mock_configuration_scopes(configuration_dir): """Create the configuration scopes used in `config` and `mutable_config`.""" - scopes = [spack.config.InternalConfigScope("_builtin", spack.config.CONFIG_DEFAULTS)] - scopes += [ - spack.config.ConfigScope(name, str(configuration_dir.join(name))) - for name in ["site", "system", "user"] + return [ + spack.config.InternalConfigScope("_builtin", spack.config.CONFIG_DEFAULTS), + spack.config.ConfigScope("site", str(configuration_dir.join("site"))), + spack.config.ConfigScope("system", str(configuration_dir.join("system"))), + spack.config.ConfigScope("user", str(configuration_dir.join("user"))), + spack.config.InternalConfigScope("command_line"), ] - scopes += [spack.config.InternalConfigScope("command_line")] - return scopes @pytest.fixture(scope="session") -- cgit v1.2.3-60-g2f50