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

bugfix: relax racy test in fg/bg output (#21755)

Browse Source 
Since signals are fundamentally racy, We can't bound the amount of time
that the `test_foreground_background_output` test will take to get to
'on', we can only observe that it transitions to 'on'. So instead of
using an arbitrary limit, just adjust the test to allow either 'on' or
'off' followed by 'on'.

This should eliminate the spurious errors we see in CI.
This commit is contained in:
Todd Gamblin 2021-02-18 00:33:08 -08:00 committed by GitHub
parent 8aaf31b166
commit 7d586234ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/spack/spack/test/llnl/util/tty/log.py
View File

@ -437,20 +437,14 @@ def test_foreground_background_output(
with open(log_path) as log: with open(log_path) as log:
log = log.read().strip().split("\n") log = log.read().strip().split("\n")
# Controller and minion process coordinate with locks such that the minion # Controller and minion process coordinate with locks such that the
# writes "off" when echo is off, and "on" when echo is on. The # minion writes "off" when echo is off, and "on" when echo is on. The
# output should contain mostly "on" lines, but may contain an "off" # output should contain mostly "on" lines, but may contain "off"
# or two. This is because the controller toggles echo by sending "v" on # lines if the controller is slow. The important thing to observe
# stdin to the minion, but this is not synchronized with our locks. # here is that we started seeing 'on' in the end.
# It's good enough for a test, though. We allow at most 4 "off"'s in
# the output to account for the race.
#
# Originally we only allowed 2, but GitHub's macOS runners seem to be
# very slow, and frequently we get 3 "off"'s. Increased limit to 4 to
# account for this. Real errors should still be caught with this limit.
assert ( assert (
['forced output', 'on'] == uniq(output) or ['forced output', 'on'] == uniq(output) or
output.count("off") <= 4 # if controller_fd is a bit slow ['forced output', 'off', 'on'] == uniq(output)
) )
# log should be off for a while, then on, then off # log should be off for a while, then on, then off