# HG changeset patch # User Matt Harbison # Date 1727908212 14400 # Node ID 9cfc95e901ece4b66afb5e4e0f600172b06dc36d # Parent d7e61891ab5ae16bb25efb3213452c113df48235 tests: print the actual timeout value used in `wait-on-file` Previously, it was printing the time passed in, prior to it being scaled up to account for a longer timeout. diff -r d7e61891ab5a -r 9cfc95e901ec tests/testlib/wait-on-file --- a/tests/testlib/wait-on-file Wed Oct 02 18:19:59 2024 -0400 +++ b/tests/testlib/wait-on-file Wed Oct 02 18:30:12 2024 -0400 @@ -11,14 +11,17 @@ timer="$1" -# 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 timer=$(( ( $timer * $HGTEST_TIMEOUT) / $HGTEST_TIMEOUT_DEFAULT )) fi +max_time=$timer + +# Scale the timeout to match the sleep steps below, i.e. 1/0.02. +timer=$(( 50 * $timer )) + wait_on="$2" create="" if [ $# -eq 3 ]; then @@ -34,6 +37,6 @@ sleep 0.02 done if [ "$timer" -le 0 ]; then - echo "file not created after $1 seconds: $wait_on" >&2 + echo "file not created after $max_time seconds: $wait_on" >&2 exit 1 fi