lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Increase timeouts for when travis is slow

Browse Source 
Hopefully this cuts down on spurious failures.
This commit is contained in:
James Shubin
2018-02-12 15:08:47 -05:00
parent 4fefa9f2f0
commit 644e5164b1
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/shell/augeas-1.sh
View File

@@ -10,9 +10,9 @@ mkdir -p "${MGMT_TMPDIR}"
> "${MGMT_TMPDIR}"sshd_config > "${MGMT_TMPDIR}"sshd_config
# run empty graph, with prometheus support # run empty graph, with prometheus support
$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=augeas-1.yaml & $timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --yaml=augeas-1.yaml &
pid=$! pid=$!
sleep 5s # let it converge sleep 10s # let it converge
grep "X11Forwarding no" "${MGMT_TMPDIR}"sshd_config grep "X11Forwarding no" "${MGMT_TMPDIR}"sshd_config
@@ -20,7 +20,7 @@ sed -i "s/no/yes/" "${MGMT_TMPDIR}"sshd_config
grep "X11Forwarding yes" "${MGMT_TMPDIR}"sshd_config grep "X11Forwarding yes" "${MGMT_TMPDIR}"sshd_config
sleep 3 # Augeas is slow sleep 10s # Augeas is slow
grep "X11Forwarding no" "${MGMT_TMPDIR}"sshd_config grep "X11Forwarding no" "${MGMT_TMPDIR}"sshd_config

2
test/shell/exec-fail.sh
View File

@@ -3,7 +3,7 @@
# should take a few seconds plus converged timeout, and test we don't hang! # 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 return a different exit code if the resources fail?
# TODO: should we be converged if one of the resources has permanently failed? # TODO: should we be converged if one of the resources has permanently failed?
$timeout --kill-after=40s 35s ./mgmt run --yaml exec-fail.yaml --converged-timeout=5 --no-watch --no-pgp --tmp-prefix & $timeout --kill-after=60s 55s ./mgmt run --yaml exec-fail.yaml --converged-timeout=5 --no-watch --no-pgp --tmp-prefix &
pid=$! pid=$!
wait $pid # get exit status wait $pid # get exit status
exit $? exit $?

2
test/shell/file-mode.sh
View File

@@ -9,7 +9,7 @@ fi
set -x set -x
# run till completion # run till completion
$timeout --kill-after=40s 35s ./mgmt run --yaml file-mode.yaml --converged-timeout=5 --no-watch --tmp-prefix & $timeout --kill-after=60s 55s ./mgmt run --yaml file-mode.yaml --converged-timeout=5 --no-watch --tmp-prefix &
pid=$! pid=$!
wait $pid # get exit status wait $pid # get exit status
e=$? e=$?

4
test/shell/file-move-upper-dir.sh
View File

@@ -7,9 +7,9 @@ exit 0
mkdir -p /tmp/mgmt/a/b/c/ mkdir -p /tmp/mgmt/a/b/c/
# run empty graph, with prometheus support # run empty graph, with prometheus support
$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=examples/deep-dirs.yaml & $timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --yaml=examples/deep-dirs.yaml &
pid=$! pid=$!
sleep 5s # let it converge sleep 10s # let it converge
grep f1 /tmp/mgmt/a/b/c/f1 grep f1 /tmp/mgmt/a/b/c/f1

2
test/shell/file-move.sh
View File

@@ -10,7 +10,7 @@ mkdir -p /tmp/mgmt/
rm /tmp/mgmt/f1 || true rm /tmp/mgmt/f1 || true
# run empty graph, with prometheus support # run empty graph, with prometheus support
$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log & $timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
pid=$! pid=$!
sleep 5s # let it converge sleep 5s # let it converge

2
test/shell/load0.sh
View File

@@ -34,7 +34,7 @@ file "${tmpdir}/loadavg" {
} }
EOF EOF
$timeout --kill-after=30s 15s ./mgmt run --tmp-prefix --converged-timeout=1 --lang "$tmpdir/load0.mcl" & $timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --converged-timeout=1 --lang "$tmpdir/load0.mcl" &
pid=$! pid=$!
wait $pid # get exit status wait $pid # get exit status
e=$? e=$?

2
test/shell/prometheus-1.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
# run empty graph, with prometheus support # run empty graph, with prometheus support
$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --prometheus & $timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --prometheus &
pid=$! pid=$!
sleep 5s # let it converge sleep 5s # let it converge

2
test/shell/prometheus-2.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
# run empty graph, with prometheus support # run empty graph, with prometheus support
$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --prometheus --prometheus-listen :52637 & $timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --prometheus --prometheus-listen :52637 &
pid=$! pid=$!
sleep 5s # let it converge sleep 5s # let it converge

2
test/shell/prometheus-3.sh
View File

@@ -7,7 +7,7 @@ if [[ $(uname) == "Darwin" ]] ; then
fi fi
# run a graph, with prometheus support # run a graph, with prometheus support
$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --no-pgp --prometheus --yaml prometheus-3.yaml & $timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --no-pgp --prometheus --yaml prometheus-3.yaml &
pid=$! pid=$!
sleep 10s # let it converge sleep 10s # let it converge

4
test/shell/prometheus-4.sh
View File

@@ -7,9 +7,9 @@ if [[ $(uname) == "Darwin" ]] ; then
fi fi
# run a graph, with prometheus support # run a graph, with prometheus support
$timeout --kill-after=30s 25s ./mgmt run --tmp-prefix --no-pgp --prometheus --yaml prometheus-4.yaml & $timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --no-pgp --prometheus --yaml prometheus-4.yaml &
pid=$! pid=$!
sleep 10s # let it converge sleep 15s # let it converge
# For test debugging purpose # For test debugging purpose
curl 127.0.0.1:9233/metrics curl 127.0.0.1:9233/metrics

12
test/shell/t6.sh
View File

@@ -7,24 +7,24 @@ if env | grep -q -e '^TRAVIS=true$'; then
fi fi
# run till completion # run till completion
$timeout --kill-after=40s 35s ./mgmt run --yaml t6.yaml --no-watch --tmp-prefix & $timeout --kill-after=60s 55s ./mgmt run --yaml t6.yaml --no-watch --tmp-prefix &
pid=$! pid=$!
sleep 1s # let it converge sleep 10s # let it converge
test -e /tmp/mgmt/f1 test -e /tmp/mgmt/f1
test -e /tmp/mgmt/f2 test -e /tmp/mgmt/f2
test -e /tmp/mgmt/f3 test -e /tmp/mgmt/f3
test ! -e /tmp/mgmt/f4 test ! -e /tmp/mgmt/f4
rm -f /tmp/mgmt/f2 rm -f /tmp/mgmt/f2
sleep 0.1s # let it converge or tests will fail sleep 1s # let it converge or tests will fail
test -e /tmp/mgmt/f2 test -e /tmp/mgmt/f2
rm -f /tmp/mgmt/f2 rm -f /tmp/mgmt/f2
sleep 0.1s sleep 1s
test -e /tmp/mgmt/f2 test -e /tmp/mgmt/f2
echo foo > /tmp/mgmt/f2 echo foo > /tmp/mgmt/f2
sleep 0.1s sleep 1s
test "`cat /tmp/mgmt/f2`" = "i am f2" test "`cat /tmp/mgmt/f2`" = "i am f2"
rm -f /tmp/mgmt/f2 rm -f /tmp/mgmt/f2
sleep 0.1s sleep 1s
test -e /tmp/mgmt/f2 test -e /tmp/mgmt/f2
killall -SIGINT mgmt # send ^C to exit mgmt killall -SIGINT mgmt # send ^C to exit mgmt