test: Shell tests should use unified timeout command

2019-02-22 06:15:10 -05:00
parent ab5957f1e9
commit 0d0d48d9f6
37 changed files with 124 additions and 63 deletions
--- a/test/shell/t5.sh
+++ b/test/shell/t5.sh
@@ -1,7 +1,9 @@
 #!/bin/bash -e

+. "$(dirname "$0")/../util.sh"
+
 # should take slightly more than 35s, but fail if we take much longer)
-$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --no-pgp --tmp-prefix yaml --yaml t5.yaml &
+$TIMEOUT "$MGMT" run --converged-timeout=5 --no-watch --no-pgp --tmp-prefix yaml --yaml t5.yaml &
 pid=$!
 wait $pid	# get exit status
 exit $?