hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reduce visual noise during distributed build (#23338)

Browse source
This commit is contained in:
Harmen Stoppels 2021-05-06 16:30:02 +02:00 committed by GitHub
parent dfcd01f2c7
commit e5d87b711d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/spack/spack/installer.py
View file

@ -1276,8 +1276,8 @@ def _requeue_task(self, task):
task (BuildTask): the installation build task for a package task (BuildTask): the installation build task for a package
""" """
if task.status not in [STATUS_INSTALLED, STATUS_INSTALLING]: if task.status not in [STATUS_INSTALLED, STATUS_INSTALLING]:
tty.msg('{0} {1}'.format(install_msg(task.pkg_id, self.pid), tty.debug('{0} {1}'.format(install_msg(task.pkg_id, self.pid),
'in progress by another process')) 'in progress by another process'))
new_task = task.next_attempt(self.installed) new_task = task.next_attempt(self.installed)
new_task.status = STATUS_INSTALLING new_task.status = STATUS_INSTALLING

6
lib/spack/spack/test/installer.py
View file

@ -777,7 +777,11 @@ def test_requeue_task(install_mockery, capfd):
installer = create_installer(const_arg) installer = create_installer(const_arg)
task = create_build_task(installer.build_requests[0].pkg) task = create_build_task(installer.build_requests[0].pkg)
# temporarily set tty debug messages on so we can test output
current_debug_level = tty.debug_level()
tty.set_debug(1)
installer._requeue_task(task) installer._requeue_task(task)
tty.set_debug(current_debug_level)
ids = list(installer.build_tasks) ids = list(installer.build_tasks)
assert len(ids) == 1 assert len(ids) == 1
@ -786,7 +790,7 @@ def test_requeue_task(install_mockery, capfd):
assert qtask.sequence > task.sequence assert qtask.sequence > task.sequence
assert qtask.attempts == task.attempts + 1 assert qtask.attempts == task.attempts + 1
out = capfd.readouterr()[0] out = capfd.readouterr()[1]
assert 'Installing a' in out assert 'Installing a' in out
assert ' in progress by another process' in out assert ' in progress by another process' in out