test: Enable and fix up some more tests

An unstable engine probably masked some of these issues.
2019-02-14 17:32:06 -05:00
parent aa165b5e17
commit ccad6e7e1a
32 changed files with 53 additions and 75 deletions
--- 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