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/prometheus-4.sh
+++ b/test/shell/prometheus-4.sh
@@ -1,9 +1,11 @@
 #!/bin/bash -xe

+. "$(dirname "$0")/../util.sh"
+
 exit 0	# XXX: temporarily disabled until prometheus is added back post refactor

 # run a graph, with prometheus support
-$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --no-pgp --prometheus yaml --yaml prometheus-4.yaml &
+$TIMEOUT "$MGMT" run --tmp-prefix --no-pgp --prometheus yaml --yaml prometheus-4.yaml &
 pid=$!
 sleep 15s	# let it converge