From ccad6e7e1ace356dbe2324e3aeb780907354e5b0 Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Thu, 14 Feb 2019 17:32:06 -0500
Subject: [PATCH] test: Enable and fix up some more tests

An unstable engine probably masked some of these issues.
---
 test/shell/augeas-1.sh            | 20 +++++++-------------
 test/shell/clustersize.sh         |  6 +++---
 test/shell/env0.sh                |  2 +-
 test/shell/etcd-three-hosts.sh    |  6 +++---
 test/shell/etcd-two-hosts.sh      |  4 ++--
 test/shell/exchange.sh            |  2 +-
 test/shell/exec-fail.sh           |  2 +-
 test/shell/exec-usergroup.sh      |  2 +-
 test/shell/file-mode.sh           |  2 +-
 test/shell/file-move-upper-dir.sh |  2 +-
 test/shell/file-move.sh           |  2 +-
 test/shell/file-owner.sh          |  2 +-
 test/shell/file-source.sh         |  2 +-
 test/shell/graph-exit1.yaml       | 10 +++++-----
 test/shell/graph-fanin-1.sh       |  2 +-
 test/shell/ipv6-localhost.sh      |  2 +-
 test/shell/load0.sh               | 12 ++++--------
 test/shell/net.sh                 |  4 ++--
 test/shell/prometheus-1.sh        |  2 +-
 test/shell/prometheus-2.sh        |  2 +-
 test/shell/prometheus-3.sh        |  2 +-
 test/shell/prometheus-4.sh        |  2 +-
 test/shell/sema-1.sh              |  2 +-
 test/shell/sema-2.sh              |  2 +-
 test/shell/t1.sh                  |  2 +-
 test/shell/t2.sh                  |  8 +-------
 test/shell/t3.sh                  |  6 +++---
 test/shell/t5.sh                  |  2 +-
 test/shell/t5b.sh                 |  2 +-
 test/shell/t6.sh                  |  8 +-------
 test/shell/t7.sh                  |  2 +-
 test/shell/yaml-change1.sh        |  2 +-
 32 files changed, 53 insertions(+), 75 deletions(-)

diff --git a/test/shell/augeas-1.sh b/test/shell/augeas-1.sh
index 19cca848..7294cdcf 100755
--- a/test/shell/augeas-1.sh
+++ b/test/shell/augeas-1.sh
@@ -1,28 +1,22 @@
 #!/bin/bash -e
 
-if env | grep -q -e '^TRAVIS=true$'; then
-	# inotify doesn't seem to work properly on travis
-	echo "Travis and Jenkins give wonky results here, skipping test!"
-	exit
-fi
-
 mkdir -p "${MGMT_TMPDIR}"
-> "${MGMT_TMPDIR}"sshd_config
+echo > "${MGMT_TMPDIR}"sshd_config
 
-# run empty graph, with prometheus support
-$timeout --kill-after=60s 55s "$MGMT" run --tmp-prefix yaml --yaml=augeas-1.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix yaml --yaml=augeas-1.yaml &
 pid=$!
 
 # kill server on error
 trap 'kill -SIGINT "$pid"' EXIT
 
-sleep 10s	# let it converge
+sleep 30s	# let it converge
 
 # make an exception on macOS as augeas behaves differently
 if [[ $(uname) == "Darwin" ]] ; then
 	value=false
 else
-	value=no
+	#value=no
+	value=false	# seems it's this on linux now too
 fi
 
 # make it easier to see why the test failed
@@ -31,11 +25,11 @@ cat "${MGMT_TMPDIR}"sshd_config
 
 grep "X11Forwarding ${value}" "${MGMT_TMPDIR}"sshd_config
 
-sed -i '' "s/${value}/yes/" "${MGMT_TMPDIR}"sshd_config
+sed -i 's/'"${value}"'/yes/' "${MGMT_TMPDIR}"sshd_config
 
 grep "X11Forwarding yes" "${MGMT_TMPDIR}"sshd_config
 
-sleep 10s	# Augeas is slow
+sleep 10s	# augeas is slow
 
 grep "X11Forwarding ${value}" "${MGMT_TMPDIR}"sshd_config
 
diff --git a/test/shell/clustersize.sh b/test/shell/clustersize.sh
index cf8d4155..c239941c 100755
--- a/test/shell/clustersize.sh
+++ b/test/shell/clustersize.sh
@@ -20,7 +20,7 @@ trap 'pkill -9 mgmt' EXIT
 "$MGMT" run --hostname h3 --tmp-prefix --no-pgp --seeds http://127.0.0.1:2379 --client-urls http://127.0.0.1:2383 --server-urls http://127.0.0.1:2384 empty &
 
 # wait for everything to converge
-sleep 10
+sleep 30s
 
 ETCDCTL_API=3 etcdctl --endpoints 127.0.0.1:2379 put /_mgmt/idealClusterSize 3
 
@@ -28,13 +28,13 @@ ETCDCTL_API=3 etcdctl --endpoints 127.0.0.1:2379 put /_mgmt/idealClusterSize 3
 "$MGMT" run --hostname h5 --tmp-prefix --no-pgp --seeds http://127.0.0.1:2379 --client-urls http://127.0.0.1:2387 --server-urls http://127.0.0.1:2388 empty &
 
 # wait for everything to converge
-sleep 10
+sleep 30s
 
 test "$(ETCDCTL_API=3 etcdctl --endpoints 127.0.0.1:2379 member list | wc -l)" -eq 3
 
 ETCDCTL_API=3 etcdctl --endpoints 127.0.0.1:2381 put /_mgmt/idealClusterSize 5
 
 # wait for everything to converge
-sleep 5
+sleep 30s
 
 test "$(ETCDCTL_API=3 etcdctl --endpoints 127.0.0.1:2381 member list | wc -l)" -eq 5
diff --git a/test/shell/env0.sh b/test/shell/env0.sh
index af949638..4793650d 100755
--- a/test/shell/env0.sh
+++ b/test/shell/env0.sh
@@ -14,7 +14,7 @@ if [[ ! "$tmpdir" =~ "/tmp" ]]; then
 	exit 99
 fi
 
-env TMPDIR="${tmpdir}" TEST=123 EMPTY="" $timeout -sKILL 60s "$MGMT" run --tmp-prefix --converged-timeout=5 lang --lang env0.mcl
+env TMPDIR="${tmpdir}" TEST=123 EMPTY="" $timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --converged-timeout=5 lang --lang env0.mcl
 e=$?
 
 egrep "$regex" "$tmpdir/environ" || fail_test "Could not match '$(cat "$tmpdir/environ")' in '$tmpdir/environ' to '$regex'."
diff --git a/test/shell/etcd-three-hosts.sh b/test/shell/etcd-three-hosts.sh
index e73f5553..242fd3fe 100755
--- a/test/shell/etcd-three-hosts.sh
+++ b/test/shell/etcd-three-hosts.sh
@@ -1,15 +1,15 @@
 #!/bin/bash -e
 
 # run empty graphs, we're just testing etcd clustering
-$timeout --kill-after=210s 180s "$MGMT" run --hostname h1 --tmp-prefix empty &
+$timeout --kill-after=360s 300s "$MGMT" run --hostname h1 --tmp-prefix empty &
 pid1=$!
 sleep 15s	# let it startup
 
-$timeout --kill-after=210s 180s "$MGMT" run --hostname h2 --seeds http://127.0.0.1:2379 --client-urls http://127.0.0.1:2381 --server-urls http://127.0.0.1:2382 --tmp-prefix empty &
+$timeout --kill-after=360s 300s "$MGMT" run --hostname h2 --seeds http://127.0.0.1:2379 --client-urls http://127.0.0.1:2381 --server-urls http://127.0.0.1:2382 --tmp-prefix empty &
 pid2=$!
 sleep 15s
 
-$timeout --kill-after=210s 180s "$MGMT" run --hostname h3 --seeds http://127.0.0.1:2379 --client-urls http://127.0.0.1:2383 --server-urls http://127.0.0.1:2384 --tmp-prefix empty &
+$timeout --kill-after=360s 300s "$MGMT" run --hostname h3 --seeds http://127.0.0.1:2379 --client-urls http://127.0.0.1:2383 --server-urls http://127.0.0.1:2384 --tmp-prefix empty &
 pid3=$!
 sleep 15s
 
diff --git a/test/shell/etcd-two-hosts.sh b/test/shell/etcd-two-hosts.sh
index 41bdf188..04b7bcce 100755
--- a/test/shell/etcd-two-hosts.sh
+++ b/test/shell/etcd-two-hosts.sh
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 
 # run empty graphs, we're just testing etcd clustering
-$timeout --kill-after=180s 120s "$MGMT" run --hostname h1 --tmp-prefix empty &
+$timeout --kill-after=360s 300s "$MGMT" run --hostname h1 --tmp-prefix empty &
 pid1=$!
 sleep 15s	# let it startup
 
-$timeout --kill-after=180s 120s "$MGMT" run --hostname h2 --seeds http://127.0.0.1:2379 --client-urls http://127.0.0.1:2381 --server-urls http://127.0.0.1:2382 --tmp-prefix empty &
+$timeout --kill-after=360s 300s "$MGMT" run --hostname h2 --seeds http://127.0.0.1:2379 --client-urls http://127.0.0.1:2381 --server-urls http://127.0.0.1:2382 --tmp-prefix empty &
 pid2=$!
 sleep 15s
 
diff --git a/test/shell/exchange.sh b/test/shell/exchange.sh
index dd4a73dd..cab3bc95 100755
--- a/test/shell/exchange.sh
+++ b/test/shell/exchange.sh
@@ -14,7 +14,7 @@ set -o pipefail
 trap 'pkill -9 mgmt' EXIT
 
 # wait for everything to converge
-sleep 10
+sleep 10s
 
 test "$(cat /tmp/mgmt/exchange-* | grep -c h1)" -eq 4
 test "$(cat /tmp/mgmt/exchange-* | grep -c h2)" -eq 4
diff --git a/test/shell/exec-fail.sh b/test/shell/exec-fail.sh
index 0149e764..4fd12852 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=120s 75s "$MGMT" run --converged-timeout=15 --no-watch --no-pgp --tmp-prefix yaml --yaml exec-fail.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=15 --no-watch --no-pgp --tmp-prefix yaml --yaml exec-fail.yaml &
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/exec-usergroup.sh b/test/shell/exec-usergroup.sh
index 4fbdfcb3..14a2440e 100755
--- a/test/shell/exec-usergroup.sh
+++ b/test/shell/exec-usergroup.sh
@@ -38,7 +38,7 @@ function run_usergroup_test() {
 	setup
 
 	# run till completion
-	sudo -A timeout --kill-after=45s 40s "$MGMT" run --converged-timeout=15 --no-watch --tmp-prefix yaml --yaml ./exec-usergroup/${graph} &
+	sudo -A timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=15 --no-watch --tmp-prefix yaml --yaml ./exec-usergroup/${graph} &
 	pid=$!
 	wait $pid	# get exit status
 	e=$?
diff --git a/test/shell/file-mode.sh b/test/shell/file-mode.sh
index 1fdf574c..b0d0f066 100755
--- a/test/shell/file-mode.sh
+++ b/test/shell/file-mode.sh
@@ -5,7 +5,7 @@ set -x
 . ../util.sh
 
 # run till completion
-$timeout --kill-after=60s 55s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml file-mode.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml file-mode.yaml &
 pid=$!
 wait $pid	# get exit status
 e=$?
diff --git a/test/shell/file-move-upper-dir.sh b/test/shell/file-move-upper-dir.sh
index 8ec0a640..a495ea4f 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=60s 55s "$MGMT" run --tmp-prefix yaml --yaml=examples/deep-dirs.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix yaml --yaml=examples/deep-dirs.yaml &
 pid=$!
 sleep 10s	# let it converge
 
diff --git a/test/shell/file-move.sh b/test/shell/file-move.sh
index 87ffaf22..62879ec6 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 &>/dev/null || true
 
 # run empty graph, with prometheus support
-$timeout --kill-after=60s 55s "$MGMT" run --tmp-prefix yaml --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix yaml --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/file-owner.sh b/test/shell/file-owner.sh
index 65c63456..a6825bb9 100755
--- a/test/shell/file-owner.sh
+++ b/test/shell/file-owner.sh
@@ -9,7 +9,7 @@ if ! timeout 1s sudo -A true; then
 fi
 
 # run till completion
-$timeout --kill-after=30s 25s sudo -A "$MGMT" run  --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml file-owner.yaml &
+$timeout --kill-after=360s 300s sudo -A "$MGMT" run  --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml file-owner.yaml &
 pid=$!
 wait $pid	# get exit status
 e=$?
diff --git a/test/shell/file-source.sh b/test/shell/file-source.sh
index 35d2e9a6..71b1825b 100755
--- a/test/shell/file-source.sh
+++ b/test/shell/file-source.sh
@@ -9,7 +9,7 @@ if ! timeout 1s sudo -A true; then
 fi
 
 # run till completion
-$timeout --kill-after=30s 25s sudo -A "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix lang --lang file-source.mcl &
+$timeout --kill-after=360s 300s sudo -A "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix lang --lang file-source.mcl &
 pid=$!
 wait $pid	# get exit status
 e=$?
diff --git a/test/shell/graph-exit1.yaml b/test/shell/graph-exit1.yaml
index 8583a1cc..02cae43d 100644
--- a/test/shell/graph-exit1.yaml
+++ b/test/shell/graph-exit1.yaml
@@ -3,7 +3,7 @@ graph: parallel
 resources:
   exec:
   - name: exec1
-    cmd: sleep 15s
+    cmd: sleep 10s
     shell: ''
     timeout: 0
     watchcmd: ''
@@ -12,7 +12,7 @@ resources:
     ifshell: ''
     state: present
   - name: exec2
-    cmd: sleep 15s
+    cmd: sleep 10s
     shell: ''
     timeout: 0
     watchcmd: ''
@@ -21,7 +21,7 @@ resources:
     ifshell: ''
     state: present
   - name: exec3
-    cmd: sleep 15s
+    cmd: sleep 10s
     shell: ''
     timeout: 0
     watchcmd: ''
@@ -30,7 +30,7 @@ resources:
     ifshell: ''
     state: present
   - name: exec4
-    cmd: sleep 15s
+    cmd: sleep 10s
     shell: ''
     timeout: 0
     watchcmd: ''
@@ -39,7 +39,7 @@ resources:
     ifshell: ''
     state: present
   - name: exec0
-    cmd: sleep 15s
+    cmd: sleep 10s
     shell: ''
     timeout: 0
     watchcmd: ''
diff --git a/test/shell/graph-fanin-1.sh b/test/shell/graph-fanin-1.sh
index dae88e00..22c44a0b 100755
--- a/test/shell/graph-fanin-1.sh
+++ b/test/shell/graph-fanin-1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # should take more than 25s plus overhead
-$timeout --kill-after=50s 45s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix --no-pgp yaml --yaml graph-fanin-1.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix --no-pgp yaml --yaml graph-fanin-1.yaml &
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/ipv6-localhost.sh b/test/shell/ipv6-localhost.sh
index 4afadd0d..9195ecec 100755
--- a/test/shell/ipv6-localhost.sh
+++ b/test/shell/ipv6-localhost.sh
@@ -20,7 +20,7 @@ pid=$!
 trap 'pkill -9 mgmt' EXIT
 
 # give mgmt a little time to startup
-sleep 10
+sleep 10s
 
 # mgmt configured for ipv6 only should not listen on any IPv4 ports
 lsof -Pn -p "$pid" -a -i | grep '127.0.0.1' && false
diff --git a/test/shell/load0.sh b/test/shell/load0.sh
index 80c990ef..e104eb25 100755
--- a/test/shell/load0.sh
+++ b/test/shell/load0.sh
@@ -1,10 +1,6 @@
 #!/bin/bash -e
 
-if env | grep -q -e '^TRAVIS=true$'; then
-	# loadavg glibc calls don't seem to work properly on osx OS in travis
-	echo "Travis and Jenkins give wonky results here, skipping test!"
-	exit
-fi
+# TODO: do loadavg calls work properly on macOS in travis?
 
 set -o errexit
 set -o pipefail
@@ -16,7 +12,7 @@ set -o pipefail
 # Precision varies (eg: 4, 9 or 11 digits). Hence no strict check for precision but
 # anything above 3 will do. It is assumed we will hardly ever get a precision lower than 3 digits
 # from the current implementations. Otherwise this test would need to be revised.
-regex="load average: [0-9]\,[0-9]{3,}, [0-9]\,[0-9]{3,}, [0-9]\,[0-9]{3,}"
+regex="load average: [0-9]\.[0-9]{3,}, [0-9]\.[0-9]{3,}, [0-9]\.[0-9]{3,}"
 
 tmpdir="$($mktemp --tmpdir -d tmp.XXX)"
 if [[ ! "$tmpdir" =~ "/tmp" ]]; then
@@ -35,12 +31,12 @@ import "sys"
 \$x15 = structlookup(\$theload, "x15")
 
 file "${tmpdir}/loadavg" {
-	content => fmt.printf("load average: %f, %f, %f", \$x1, \$x5, \$x15),
+	content => fmt.printf("load average: %f, %f, %f\n", \$x1, \$x5, \$x15),
 	state => "exists",
 }
 EOF
 
-$timeout --kill-after=60s 55s "$MGMT" run --tmp-prefix --converged-timeout=1 lang --lang "$tmpdir/load0.mcl"  &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --converged-timeout=5 lang --lang "$tmpdir/load0.mcl"  &
 pid=$!
 wait $pid	# get exit status
 e=$?
diff --git a/test/shell/net.sh b/test/shell/net.sh
index 06ef2934..f20162c6 100755
--- a/test/shell/net.sh
+++ b/test/shell/net.sh
@@ -44,7 +44,7 @@ sudo mkdir -p /etc/systemd/network
 sudo ip link add $IFACE type dummy || true
 
 # run mgmt net res with $IFACE and $ADDR set as above
-sudo -A $timeout --kill-after=55s 50s "$MGMT" run --converged-timeout=5 --tmp-prefix lang --lang ./net0.mcl &
+sudo -A $timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --tmp-prefix lang --lang ./net0.mcl &
 pid1=$!
 
 # give the engine time to start up
@@ -85,7 +85,7 @@ wait $pid1
 e1=$?
 
 # run mgmt net res with $IFACE state => "down"
-sudo -A $timeout --kill-after=20 15s "$MGMT" run --converged-timeout=5 --tmp-prefix lang --lang ./net1.mcl &
+sudo -A $timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --tmp-prefix lang --lang ./net1.mcl &
 
 # give the engine time to start up
 sleep 5
diff --git a/test/shell/prometheus-1.sh b/test/shell/prometheus-1.sh
index 98e7e989..79330ea4 100755
--- a/test/shell/prometheus-1.sh
+++ b/test/shell/prometheus-1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # run empty graph, with prometheus support
-$timeout --kill-after=60s 55s "$MGMT" run --tmp-prefix --prometheus empty &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --prometheus empty &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/prometheus-2.sh b/test/shell/prometheus-2.sh
index d36a1f14..fc7dd2ff 100755
--- a/test/shell/prometheus-2.sh
+++ b/test/shell/prometheus-2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # run empty graph, with prometheus support
-$timeout --kill-after=60s 55s "$MGMT" run --tmp-prefix --prometheus --prometheus-listen :52637 empty &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --prometheus --prometheus-listen :52637 empty &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/prometheus-3.sh b/test/shell/prometheus-3.sh
index 438bf33e..d538b886 100755
--- a/test/shell/prometheus-3.sh
+++ b/test/shell/prometheus-3.sh
@@ -3,7 +3,7 @@
 exit 0	# XXX: temporarily disabled until prometheus is added back post refactor
 
 # run a graph, with prometheus support
-$timeout --kill-after=60s 55s "$MGMT" run --tmp-prefix --no-pgp --prometheus yaml --yaml prometheus-3.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --no-pgp --prometheus yaml --yaml prometheus-3.yaml &
 pid=$!
 sleep 10s	# let it converge
 
diff --git a/test/shell/prometheus-4.sh b/test/shell/prometheus-4.sh
index 251d68fb..4a3ea3c4 100755
--- a/test/shell/prometheus-4.sh
+++ b/test/shell/prometheus-4.sh
@@ -3,7 +3,7 @@
 exit 0	# XXX: temporarily disabled until prometheus is added back post refactor
 
 # run a graph, with prometheus support
-$timeout --kill-after=60s 55s "$MGMT" run --tmp-prefix --no-pgp --prometheus yaml --yaml prometheus-4.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --no-pgp --prometheus yaml --yaml prometheus-4.yaml &
 pid=$!
 sleep 15s	# let it converge
 
diff --git a/test/shell/sema-1.sh b/test/shell/sema-1.sh
index 177b5045..835439bd 100755
--- a/test/shell/sema-1.sh
+++ b/test/shell/sema-1.sh
@@ -2,7 +2,7 @@
 
 # should take at least 55s, but fail if we block this
 # TODO: it would be nice to make sure this test doesn't exit too early!
-$timeout --kill-after=120s 110s "$MGMT" run  --sema 2 --converged-timeout=5 --no-watch --no-pgp --tmp-prefix yaml --yaml sema-1.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run  --sema 2 --converged-timeout=5 --no-watch --no-pgp --tmp-prefix yaml --yaml sema-1.yaml &
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/sema-2.sh b/test/shell/sema-2.sh
index cc04cea4..2a54a7ce 100755
--- a/test/shell/sema-2.sh
+++ b/test/shell/sema-2.sh
@@ -2,7 +2,7 @@
 
 # should take at least 55s, but fail if we block this
 # TODO: it would be nice to make sure this test doesn't exit too early!
-$timeout --kill-after=120s 110s "$MGMT" run --converged-timeout=5 --no-watch --no-pgp --tmp-prefix lang --lang sema-2.mcl &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --no-pgp --tmp-prefix lang --lang sema-2.mcl &
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/t1.sh b/test/shell/t1.sh
index ac0218be..4464a6da 100755
--- a/test/shell/t1.sh
+++ b/test/shell/t1.sh
@@ -9,7 +9,7 @@
 set -o errexit
 set -o pipefail
 
-$timeout --kill-after=3s 1s "$MGMT" --help # hello world!
+$timeout --kill-after=360s 300s "$MGMT" --help # hello world!
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/t2.sh b/test/shell/t2.sh
index 3c652228..c7641f0f 100755
--- a/test/shell/t2.sh
+++ b/test/shell/t2.sh
@@ -1,13 +1,7 @@
 #!/bin/bash -e
 
-if env | grep -q -e '^TRAVIS=true$'; then
-	# inotify doesn't seem to work properly on travis
-	echo "Travis and Jenkins give wonky results here, skipping test!"
-	exit
-fi
-
 # run till completion
-$timeout --kill-after=15s 10s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml t2.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml t2.yaml &
 pid=$!
 wait $pid	# get exit status
 e=$?
diff --git a/test/shell/t3.sh b/test/shell/t3.sh
index 1c6999ed..41c3db66 100755
--- a/test/shell/t3.sh
+++ b/test/shell/t3.sh
@@ -10,11 +10,11 @@ fi
 mkdir -p "${MGMT_TMPDIR}"mgmt{A..C}
 
 # run till completion
-$timeout --kill-after=15s 10s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml t3-a.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml t3-a.yaml &
 pid1=$!
-$timeout --kill-after=15s 10s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml t3-b.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml t3-b.yaml &
 pid2=$!
-$timeout --kill-after=15s 10s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml t3-c.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --tmp-prefix yaml --yaml t3-c.yaml &
 pid3=$!
 
 wait $pid1	# get exit status
diff --git a/test/shell/t5.sh b/test/shell/t5.sh
index 9115b1a2..335ecd05 100755
--- a/test/shell/t5.sh
+++ b/test/shell/t5.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # should take slightly more than 35s, but fail if we take much longer)
-$timeout --kill-after=55s 50s "$MGMT" run --converged-timeout=5 --no-watch --no-pgp --tmp-prefix yaml --yaml t5.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --no-pgp --tmp-prefix yaml --yaml t5.yaml &
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/t5b.sh b/test/shell/t5b.sh
index b7933486..4f859786 100755
--- a/test/shell/t5b.sh
+++ b/test/shell/t5b.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # should take slightly more than 35s, but fail if we take much longer)
-$timeout --kill-after=55s 50s "$MGMT" run --converged-timeout=5 --no-watch --no-pgp --tmp-prefix yaml --yaml t5b.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --converged-timeout=5 --no-watch --no-pgp --tmp-prefix yaml --yaml t5b.yaml &
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/t6.sh b/test/shell/t6.sh
index 3ea1e7c5..933b2c36 100755
--- a/test/shell/t6.sh
+++ b/test/shell/t6.sh
@@ -1,13 +1,7 @@
 #!/bin/bash -e
 
-if env | grep -q -e '^TRAVIS=true$'; then
-	# inotify doesn't seem to work properly on travis
-	echo "Travis and Jenkins give wonky results here, skipping test!"
-	exit
-fi
-
 # run till completion
-$timeout --kill-after=60s 55s "$MGMT" run --no-watch --tmp-prefix yaml --yaml t6.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --no-watch --tmp-prefix yaml --yaml t6.yaml &
 pid=$!
 sleep 10s	# let it converge
 test -e /tmp/mgmt/f1
diff --git a/test/shell/t7.sh b/test/shell/t7.sh
index 5346e981..1877fe08 100755
--- a/test/shell/t7.sh
+++ b/test/shell/t7.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # run empty graph
-$timeout --kill-after=45s 35s "$MGMT" run --tmp-prefix --no-pgp empty &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --no-pgp empty &
 pid=$!
 sleep 10s	# let it converge
 $(sleep 3s && killall -SIGINT mgmt)&	# send ^C to exit mgmt
diff --git a/test/shell/yaml-change1.sh b/test/shell/yaml-change1.sh
index 5c339136..1699761f 100755
--- a/test/shell/yaml-change1.sh
+++ b/test/shell/yaml-change1.sh
@@ -14,7 +14,7 @@ fi
 
 # set the config file
 cp -a yaml-change1a.yaml /tmp/mgmt/yaml-change.yaml
-$timeout --kill-after=30s 20s "$MGMT" run --tmp-prefix yaml --yaml /tmp/mgmt/yaml-change.yaml &
+$timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix yaml --yaml /tmp/mgmt/yaml-change.yaml &
 pid=$!
 sleep 5s	# let it converge
 grep -q 'hello world' /tmp/mgmt/change1	# check contents are correct