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/file-move-upper-dir.sh
+++ b/test/shell/file-move-upper-dir.sh
@@ -4,10 +4,12 @@

 exit 0

+. "$(dirname "$0")/../util.sh"
+
 mkdir -p /tmp/mgmt/a/b/c/

 # run empty graph, with prometheus support
-$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix yaml --yaml=examples/deep-dirs.yaml &
+$TIMEOUT "$MGMT" run --tmp-prefix yaml --yaml=examples/deep-dirs.yaml &
 pid=$!
 sleep 10s	# let it converge