test: Shell tests should use unified timeout command

This commit is contained in:
James Shubin
2019-02-22 06:15:10 -05:00
parent ab5957f1e9
commit 0d0d48d9f6
37 changed files with 124 additions and 63 deletions

View File

@@ -1,11 +1,13 @@
#!/bin/bash -e
. "$(dirname "$0")/../util.sh"
# run empty graphs, we're just testing etcd clustering
$timeout --kill-after=360s 300s "$MGMT" run --hostname h1 --tmp-prefix empty &
$TIMEOUT "$MGMT" run --hostname h1 --tmp-prefix empty &
pid1=$!
sleep 15s # let it startup
$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 &
$TIMEOUT "$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