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.sh
+++ b/test/shell/file-move.sh
@@ -1,10 +1,12 @@
 #!/bin/bash -e

+. "$(dirname "$0")/../util.sh"
+
 mkdir -p /tmp/mgmt/
 rm /tmp/mgmt/f1 &>/dev/null || true

 # run empty graph, with prometheus support
-$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix yaml --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
+$TIMEOUT "$MGMT" run --tmp-prefix yaml --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
 pid=$!
 sleep 5s	# let it converge