This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8505

tests: fix timer scaling in wait-on-file
ClosedPublic

Authored by joerg.sonnenberger on May 7 2020, 5:40 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG9d7d53771e5f: tests: fix timer scaling in wait-on-file
rHGef65676bf2d4: tests: fix timer scaling in wait-on-file
Summary

When using the default test timeouts, wait-on-file would not wait for $n
seconds, but $n/100 seconds. This resulted in easy timeouts on even
moderately busy fast machines. Fix the scaling to apply in all cases.
Adjust the stepping slightly to be nicer to systems with the historic
100Hz time base to ensure that the scheduler actually switches to a
different process and gives them time to work.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute accepted this revision.May 7 2020, 5:46 PM
marmoute added a subscriber: marmoute.

woops

joerg.sonnenberger added a commit: rHGef65676bf2d4: tests: fix timer scaling in wait-on-file.May 11 2020, 7:37 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGef65676bf2d4: tests: fix timer scaling in wait-on-file (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/testlib/wait-on-file (9 lines)

Diff 21348

tests/testlib/wait-on-file

#!/bin/sh #!/bin/sh
# #
# wait up to TIMEOUT seconds until a WAIT_ON_FILE is created. # wait up to TIMEOUT seconds until a WAIT_ON_FILE is created.
# #
# In addition, this script can create CREATE_FILE once it is ready to wait. # In addition, this script can create CREATE_FILE once it is ready to wait.
if [ $# -lt 2 ] || [ $# -gt 3 ]; then if [ $# -lt 2 ] || [ $# -gt 3 ]; then
echo $# echo $#
echo "USAGE: $0 TIMEOUT WAIT_ON_FILE [CREATE_FILE]" echo "USAGE: $0 TIMEOUT WAIT_ON_FILE [CREATE_FILE]"
fi fi
timer="$1" timer="$1"
# if the test timeout have been extended, explicitly extend the provided timer # Scale the timeout to match the sleep steps below, i.e. 1/0.02.
timer=$(( 50 * $timer ))
# If the test timeout have been extended, also scale the timer relative
# to the normal timing.
if [ "$HGTEST_TIMEOUT_DEFAULT" -lt "$HGTEST_TIMEOUT" ]; then if [ "$HGTEST_TIMEOUT_DEFAULT" -lt "$HGTEST_TIMEOUT" ]; then
timer=$(( ( 100 * $timer * $HGTEST_TIMEOUT) / $HGTEST_TIMEOUT_DEFAULT )) timer=$(( ( $timer * $HGTEST_TIMEOUT) / $HGTEST_TIMEOUT_DEFAULT ))
fi fi
wait_on="$2" wait_on="$2"
create="" create=""
if [ $# -eq 3 ]; then if [ $# -eq 3 ]; then
create="$3" create="$3"
fi fi
if [ -n "$create" ]; then if [ -n "$create" ]; then
touch "$create" touch "$create"
create="" create=""
fi fi
while [ "$timer" -gt 0 ] && [ ! -f "$wait_on" ]; do while [ "$timer" -gt 0 ] && [ ! -f "$wait_on" ]; do
timer=$(( $timer - 1)) timer=$(( $timer - 1))
sleep 0.01 sleep 0.02
done done
if [ "$timer" -le 0 ]; then if [ "$timer" -le 0 ]; then
echo "file not created after $1 seconds: $wait_on" >&2 echo "file not created after $1 seconds: $wait_on" >&2
exit 1 exit 1
fi fi