test: Enable and fix up some more tests

An unstable engine probably masked some of these issues.

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=$?