tests: print the actual timeout value used in `wait-on-file`
authorMatt Harbison <matt_harbison@yahoo.com>
Wed, 02 Oct 2024 18:30:12 -0400
changeset 51947 9cfc95e901ec
parent 51946 d7e61891ab5a
child 51948 ed90f4a1bb2c
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.
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