zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style

Browse Source
This commit is contained in:
kshea21 2025-01-08 11:11:40 -08:00 committed by Gregory Becker
parent 11572c0caf
commit 1a19c09c55
No known key found for this signature in database
GPG Key ID: 2362541F6D14ED84
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/spack/spack/installer.py
View File

@ -2226,8 +2226,11 @@ def complete_task(task) -> None:
keep_prefix = install_args.get("keep_prefix") keep_prefix = install_args.get("keep_prefix")
action = self._install_action(task) action = self._install_action(task)
try: try:
self._complete_task(task, install_status) try:
active_tasks.remove(task) self._complete_task(task, install_status)
finally:
# Remove task from active_tasks on error or success
active_tasks.remove(task)
# If we installed then we should keep the prefix # If we installed then we should keep the prefix
stop_before_phase = getattr(pkg, "stop_before_phase", None) stop_before_phase = getattr(pkg, "stop_before_phase", None)

5
lib/spack/spack/test/installer.py
View File

@ -984,6 +984,7 @@ class MyBuildException(Exception):
_old_complete_task = None _old_complete_task = None
def _install_fail_my_build_exception(installer, task, install_status, **kwargs): def _install_fail_my_build_exception(installer, task, install_status, **kwargs):
if task.pkg.name == "pkg-a": if task.pkg.name == "pkg-a":
print("Raising MyBuildException for pkg-a") print("Raising MyBuildException for pkg-a")
@ -995,13 +996,13 @@ def _install_fail_my_build_exception(installer, task, install_status, **kwargs):
def test_install_fail_single(install_mockery, mock_fetch, monkeypatch): def test_install_fail_single(install_mockery, mock_fetch, monkeypatch):
"""Test expected results for failure of single package.""" """Test expected results for failure of single package."""
global _old_complete_task global _old_complete_task
installer = create_installer(["pkg-a"], {"fake": True}) installer = create_installer(["pkg-a"], {"fake": True})
# Raise a KeyboardInterrupt error to trigger early termination # Raise a KeyboardInterrupt error to trigger early termination
_old_complete_task = inst.PackageInstaller._complete_task _old_complete_task = inst.PackageInstaller._complete_task
monkeypatch.setattr(inst.PackageInstaller, "_complete_task", _install_fail_my_build_exception) monkeypatch.setattr(inst.PackageInstaller, "_complete_task", _install_fail_my_build_exception)
with pytest.raises(MyBuildException, match="mock internal package build error for pkg-a"): with pytest.raises(MyBuildException, match="mock internal package build error for pkg-a"):
installer.install() installer.install()