update comments, remove mutable_config fixture from individual test because it was applied from the containing class

scheibelp · scheibelp · commit 68aaa641015e · 2025-10-17T15:45:06.000-07:00
diff --git a/lib/spack/spack/test/concretization/core.py b/lib/spack/spack/test/concretization/core.py
@@ -484,7 +484,7 @@ def test_disable_mixing_override_by_package(self):
             with pytest.raises(spack.error.UnsatisfiableSpecError):
                 spack.concretize.concretize_one("dt-diamond%clang ^dt-diamond-left%gcc")
 
-    def test_disable_mixing_reuse(self, mutable_database, mutable_config):
+    def test_disable_mixing_reuse(self, mutable_database):
         # Install a spec
         left = spack.concretize.concretize_one("dt-diamond-left %gcc")
         PackageInstaller([left.package], fake=True, explicit=True).install()
diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py
@@ -501,22 +501,12 @@ def mock_stage(tmp_path_factory: pytest.TempPathFactory, monkeypatch, request):
 
 
 @pytest.fixture(scope="session")
-def mock_stage_for_database(tmp_path_factory: pytest.TempPathFactory, monkeypatch_session, request):
-    """Establish the temporary build_stage for the mock archive."""
-    # The approach with this autouse fixture is to set the stage root
-    # instead of using spack.config.override() to avoid configuration
-    # conflicts with dozens of tests that rely on other configuration
-    # fixtures, such as config.
-
-    if "nomockstage" in request.keywords:
-        # Tests can opt-out with @pytest.mark.nomockstage
-        yield None
-        return
-
-    # Set the build stage to the requested path
+def mock_stage_for_database(tmp_path_factory: pytest.TempPathFactory, monkeypatch_session):
+    """A session-scoped analog of mock_stage, so that the mock_store
+    fixture uses its own stage vs. the global stage root for spack.
+    """
     new_stage = tmp_path_factory.mktemp("mock-stage")
 
-    # Ensure the source directory exists within the new stage path
     source_path = new_stage / spack.stage._source_path_subdir
     source_path.mkdir(parents=True, exist_ok=True)
 
