diff --git a/test/shell/t2.sh b/test/shell/t2.sh index 56ce776f..d0d76647 100755 --- a/test/shell/t2.sh +++ b/test/shell/t2.sh @@ -7,7 +7,7 @@ if env | grep -q -e '^TRAVIS=true$'; then fi # run till completion -timeout --kill-after=15s 10s ./mgmt run --file t2.yaml --converged-timeout=5 --no-watch & +timeout --kill-after=15s 10s ./mgmt run --file t2.yaml --converged-timeout=5 --no-watch --allow-tmp-prefix & pid=$! wait $pid # get exit status e=$? diff --git a/test/shell/t3.sh b/test/shell/t3.sh index 13790ec2..f79c4f50 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 --file t3-a.yaml --converged-timeout=5 --no-watch & +timeout --kill-after=15s 10s ./mgmt run --file t3-a.yaml --converged-timeout=5 --no-watch --allow-tmp-prefix & pid1=$! -timeout --kill-after=15s 10s ./mgmt run --file t3-b.yaml --converged-timeout=5 --no-watch & +timeout --kill-after=15s 10s ./mgmt run --file t3-b.yaml --converged-timeout=5 --no-watch --allow-tmp-prefix & pid2=$! -timeout --kill-after=15s 10s ./mgmt run --file t3-c.yaml --converged-timeout=5 --no-watch & +timeout --kill-after=15s 10s ./mgmt run --file t3-c.yaml --converged-timeout=5 --no-watch --allow-tmp-prefix & pid3=$! wait $pid1 # get exit status diff --git a/test/shell/t4.sh b/test/shell/t4.sh index e334004d..6cca0cd5 100755 --- a/test/shell/t4.sh +++ b/test/shell/t4.sh @@ -1,7 +1,7 @@ #!/bin/bash -e # should take slightly more than 25s, but fail if we take 35s) -timeout --kill-after=35s 30s ./mgmt run --file t4.yaml --converged-timeout=5 --no-watch & +timeout --kill-after=35s 30s ./mgmt run --file t4.yaml --converged-timeout=5 --no-watch --allow-tmp-prefix & pid=$! wait $pid # get exit status exit $? diff --git a/test/shell/t5.sh b/test/shell/t5.sh index 9527b723..79d53616 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 45s) -timeout --kill-after=45s 40s ./mgmt run --file t5.yaml --converged-timeout=5 --no-watch & +timeout --kill-after=45s 40s ./mgmt run --file t5.yaml --converged-timeout=5 --no-watch --allow-tmp-prefix & pid=$! wait $pid # get exit status exit $? diff --git a/test/shell/t6.sh b/test/shell/t6.sh index 40222f0e..c8805df7 100755 --- a/test/shell/t6.sh +++ b/test/shell/t6.sh @@ -7,7 +7,7 @@ if env | grep -q -e '^TRAVIS=true$'; then fi # run till completion -timeout --kill-after=20s 15s ./mgmt run --file t6.yaml --no-watch & +timeout --kill-after=20s 15s ./mgmt run --file t6.yaml --no-watch --allow-tmp-prefix & pid=$! sleep 1s # let it converge test -e /tmp/mgmt/f1 diff --git a/test/shell/t7.sh b/test/shell/t7.sh index c85a9857..2a590905 100755 --- a/test/shell/t7.sh +++ b/test/shell/t7.sh @@ -1,7 +1,7 @@ #!/bin/bash -e # run empty graph -timeout --kill-after=20s 15s ./mgmt run & +timeout --kill-after=20s 15s ./mgmt run --allow-tmp-prefix & pid=$! sleep 5s # let it converge $(sleep 3s && killall -SIGINT mgmt)& # send ^C to exit mgmt diff --git a/test/shell/t8.sh b/test/shell/t8.sh index ed2da33f..16e925e0 100755 --- a/test/shell/t8.sh +++ b/test/shell/t8.sh @@ -1,11 +1,11 @@ #!/bin/bash -e # run empty graphs, we're just testing etcd clustering -timeout --kill-after=120s 90s ./mgmt run --hostname h1 & +timeout --kill-after=120s 90s ./mgmt run --hostname h1 --allow-tmp-prefix & pid1=$! sleep 5s # let it startup -timeout --kill-after=120s 90s ./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 & +timeout --kill-after=120s 90s ./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 --allow-tmp-prefix & pid2=$! sleep 5s