test: shell: Increase etcd timeouts for slow travis

We need a real test environment that's not travis.
This commit is contained in:
James Shubin
2019-04-16 17:21:05 -04:00
parent 5ad8b33aa7
commit 272fd3edc3

View File

@@ -5,31 +5,31 @@
# run empty graphs, we're just testing etcd clustering # run empty graphs, we're just testing etcd clustering
$TIMEOUT "$MGMT" run --hostname h1 --tmp-prefix empty & $TIMEOUT "$MGMT" run --hostname h1 --tmp-prefix empty &
pid1=$! pid1=$!
sleep 15s # let it startup sleep 45s # let it startup
$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 & $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=$! pid2=$!
sleep 15s sleep 45s
$TIMEOUT "$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 "$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=$! pid3=$!
sleep 15s sleep 45s
$(sleep 15s && kill -SIGINT $pid1)& # send ^C to exit 1st mgmt (reversed!) $(sleep 45s && kill -SIGINT $pid1)& # send ^C to exit 1st mgmt (reversed!)
wait $pid1 wait $pid1
e=$? e=$?
if [ $e -ne 0 ]; then if [ $e -ne 0 ]; then
exit $e exit $e
fi fi
$(sleep 15s && kill -SIGINT $pid2)& # send ^C to exit 2nd mgmt $(sleep 45s && kill -SIGINT $pid2)& # send ^C to exit 2nd mgmt
wait $pid2 wait $pid2
e=$? e=$?
if [ $e -ne 0 ]; then if [ $e -ne 0 ]; then
exit $e exit $e
fi fi
$(sleep 15s && kill -SIGINT $pid3)& # send ^C to exit 3rd mgmt (reversed!) $(sleep 45s && kill -SIGINT $pid3)& # send ^C to exit 3rd mgmt (reversed!)
wait $pid3 # get exit status wait $pid3 # get exit status
# if pid3 exits because of a timeout, then it blocked, and this is a bug! # if pid3 exits because of a timeout, then it blocked, and this is a bug!
exit $? exit $?