From 0df4824a56678a8f2173838ff58817b22feefee9 Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Sat, 9 Sep 2017 15:31:06 -0400
Subject: [PATCH] test: Increase timeouts for slow travis

Should prevent more intermittent failures.
---
 test/shell/augeas-1.sh            | 2 +-
 test/shell/exec-fail.sh           | 2 +-
 test/shell/file-move-upper-dir.sh | 2 +-
 test/shell/file-move.sh           | 2 +-
 test/shell/t6.sh                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/shell/augeas-1.sh b/test/shell/augeas-1.sh
index 3df71289..23585ebb 100755
--- a/test/shell/augeas-1.sh
+++ b/test/shell/augeas-1.sh
@@ -10,7 +10,7 @@ mkdir -p "${MGMT_TMPDIR}"
 > "${MGMT_TMPDIR}"sshd_config
 
 # run empty graph, with prometheus support
-timeout --kill-after=20s 15s ./mgmt run --tmp-prefix --yaml=augeas-1.yaml &
+timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=augeas-1.yaml &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/exec-fail.sh b/test/shell/exec-fail.sh
index adb41e1b..39af2530 100755
--- a/test/shell/exec-fail.sh
+++ b/test/shell/exec-fail.sh
@@ -3,7 +3,7 @@
 # should take a few seconds plus converged timeout, and test we don't hang!
 # TODO: should we return a different exit code if the resources fail?
 # TODO: should we be converged if one of the resources has permanently failed?
-$timeout --kill-after=20s 15s ./mgmt run --yaml exec-fail.yaml --converged-timeout=5 --no-watch --no-pgp --tmp-prefix &
+$timeout --kill-after=40s 35s ./mgmt run --yaml exec-fail.yaml --converged-timeout=5 --no-watch --no-pgp --tmp-prefix &
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/file-move-upper-dir.sh b/test/shell/file-move-upper-dir.sh
index 945bb897..c9c586fe 100755
--- a/test/shell/file-move-upper-dir.sh
+++ b/test/shell/file-move-upper-dir.sh
@@ -7,7 +7,7 @@ exit 0
 mkdir -p /tmp/mgmt/a/b/c/
 
 # run empty graph, with prometheus support
-$timeout --kill-after=20s 15s ./mgmt run --tmp-prefix --yaml=examples/deep-dirs.yaml &
+$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=examples/deep-dirs.yaml &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/file-move.sh b/test/shell/file-move.sh
index 5e4ab951..8f8990bd 100755
--- a/test/shell/file-move.sh
+++ b/test/shell/file-move.sh
@@ -4,7 +4,7 @@ mkdir -p /tmp/mgmt/
 rm /tmp/mgmt/f1 || true
 
 # run empty graph, with prometheus support
-timeout --kill-after=20s 15s ./mgmt run --tmp-prefix --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
+timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/t6.sh b/test/shell/t6.sh
index 0f16399c..f15b5be8 100755
--- a/test/shell/t6.sh
+++ b/test/shell/t6.sh
@@ -7,7 +7,7 @@ if env | grep -q -e '^TRAVIS=true$'; then
 fi
 
 # run till completion
-$timeout --kill-after=20s 15s ./mgmt run --yaml t6.yaml --no-watch --tmp-prefix &
+$timeout --kill-after=40s 35s ./mgmt run --yaml t6.yaml --no-watch --tmp-prefix &
 pid=$!
 sleep 1s	# let it converge
 test -e /tmp/mgmt/f1