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/exec-usergroup.sh
+++ b/test/shell/exec-usergroup.sh
@@ -1,5 +1,7 @@
 #!/bin/bash

+. "$(dirname "$0")/../util.sh"
+
 set -x
 set -o pipefail

@@ -38,7 +40,7 @@ function run_usergroup_test() {
 	setup

 	# run till completion
-	sudo -A timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=15 --no-watch --tmp-prefix yaml --yaml ./exec-usergroup/${graph} &
+	sudo -A $TIMEOUT "$MGMT" run --converged-timeout=15 --no-watch --tmp-prefix yaml --yaml ./exec-usergroup/${graph} &
 	pid=$!
 	wait $pid	# get exit status
 	e=$?