Skip to content

Commit

Permalink
Merge pull request flux-framework#5017 from chu11/increase_test_timeouts
Browse files Browse the repository at this point in the history
testsuite: increase test timeouts
  • Loading branch information
mergify[bot] authored Mar 29, 2023
2 parents 3b2562e + d579d90 commit 5cd101e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions t/t2701-mini-batch.t
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ test_expect_success MULTICORE 'flux-mini batch: exclusive flag worked' '

test_expect_success 'flux-mini batch: --output=kvs directs output to kvs' '
id=$(flux mini batch -n1 --flags=waitable --output=kvs batch-script.sh) &&
run_timeout 60 flux job attach $id > kvs-output.log 2>&1 &&
run_timeout 180 flux job attach $id > kvs-output.log 2>&1 &&
test_debug "cat kvs-output.log" &&
grep "size=1 nodes=1" kvs-output.log
'
Expand All @@ -110,10 +110,10 @@ test_expect_success 'flux-mini batch: --broker-opts works' '
--broker-opts=-v batch-script.sh) &&
id2=$(flux mini batch -n1 --flags=waitable \
--broker-opts=-v,-v batch-script.sh) &&
run_timeout 60 flux job wait $id &&
run_timeout 180 flux job wait $id &&
test_debug "cat flux-${id}.out" &&
grep "boot: rank=0 size=1" flux-${id}.out &&
run_timeout 60 flux job wait $id2 &&
run_timeout 180 flux job wait $id2 &&
grep "boot: rank=0 size=1" flux-${id2}.out &&
grep "entering event loop" flux-${id2}.out
'
Expand Down Expand Up @@ -173,19 +173,19 @@ test_expect_success 'flux mini batch: MPI env vars are not set in batch script'
test_expect_success 'flux mini batch: --dump works' '
id=$(flux mini batch -N1 --dump \
--flags=waitable --wrap true) &&
run_timeout 60 flux job wait $id &&
run_timeout 180 flux job wait $id &&
tar tvf flux-${id}-dump.tgz
'
test_expect_success 'flux mini batch: --dump=FILE works' '
id=$(flux mini batch -N1 --dump=testdump.tgz \
--flags=waitable --wrap true) &&
run_timeout 60 flux job wait $id &&
run_timeout 180 flux job wait $id &&
tar tvf testdump.tgz
'
test_expect_success 'flux mini batch: --dump=FILE works with mustache' '
id=$(flux mini batch -N1 --dump=testdump-{{id}}.tgz \
--flags=waitable --wrap true) &&
run_timeout 60 flux job wait $id &&
run_timeout 180 flux job wait $id &&
tar tvf testdump-${id}.tgz
'
test_expect_success 'flux mini batch: supports directives in script' '
Expand Down
8 changes: 4 additions & 4 deletions t/t2702-mini-alloc.t
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ test_expect_success 'flux-mini alloc --bg option works' '
'
test_expect_success 'flux-mini alloc --bg option works with a command' '
jobid=$(flux mini alloc -n1 -v --bg /bin/true) &&
flux job wait-event -t15 -v $jobid finish &&
flux job wait-event -t180 -v $jobid finish &&
flux job attach $jobid
'
test_expect_success 'flux-mini alloc --bg fails if broker fails' '
Expand Down Expand Up @@ -109,17 +109,17 @@ test_expect_success NO_CHAIN_LINT 'flux-mini alloc --bg can be interrupted' '
flux queue stop &&
test_when_finished "flux queue start" &&
run_mini_bg &&
$waitfile -t 20 -v -p waiting sigint.log &&
$waitfile -t 180 -v -p waiting sigint.log &&
kill -INT $(cat sigint.pid) &&
$waitfile -t 20 -v -p Interrupt sigint.log &&
$waitfile -t 180 -v -p Interrupt sigint.log &&
wait $pid
'
test_expect_success NO_CHAIN_LINT 'flux-mini alloc --bg errors when job is canceled' '
flux queue stop &&
test_when_finished "flux queue start" &&
flux mini alloc --bg -n1 -v >canceled.log 2>&1 &
pid=$! &&
$waitfile -t 20 -v -p waiting canceled.log &&
$waitfile -t 180 -v -p waiting canceled.log &&
flux cancel --all &&
cat canceled.log &&
test_must_fail wait $pid &&
Expand Down
12 changes: 6 additions & 6 deletions t/t2714-python-cli-batch.t
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ test_expect_success MULTICORE 'flux batch: exclusive flag worked' '

test_expect_success 'flux batch: --output=kvs directs output to kvs' '
id=$(flux batch -n1 --flags=waitable --output=kvs batch-script.sh) &&
run_timeout 60 flux job attach $id > kvs-output.log 2>&1 &&
run_timeout 180 flux job attach $id > kvs-output.log 2>&1 &&
test_debug "cat kvs-output.log" &&
grep "size=1 nodes=1" kvs-output.log
'
Expand All @@ -110,10 +110,10 @@ test_expect_success 'flux batch: --broker-opts works' '
--broker-opts=-v batch-script.sh) &&
id2=$(flux batch -n1 --flags=waitable \
--broker-opts=-v,-v batch-script.sh) &&
run_timeout 60 flux job wait $id &&
run_timeout 180 flux job wait $id &&
test_debug "cat flux-${id}.out" &&
grep "boot: rank=0 size=1" flux-${id}.out &&
run_timeout 60 flux job wait $id2 &&
run_timeout 180 flux job wait $id2 &&
grep "boot: rank=0 size=1" flux-${id2}.out &&
grep "entering event loop" flux-${id2}.out
'
Expand Down Expand Up @@ -173,19 +173,19 @@ test_expect_success 'flux batch: MPI env vars are not set in batch script' '
test_expect_success 'flux batch: --dump works' '
id=$(flux batch -N1 --dump \
--flags=waitable --wrap true) &&
run_timeout 60 flux job wait $id &&
run_timeout 180 flux job wait $id &&
tar tvf flux-${id}-dump.tgz
'
test_expect_success 'flux batch: --dump=FILE works' '
id=$(flux batch -N1 --dump=testdump.tgz \
--flags=waitable --wrap true) &&
run_timeout 60 flux job wait $id &&
run_timeout 180 flux job wait $id &&
tar tvf testdump.tgz
'
test_expect_success 'flux batch: --dump=FILE works with mustache' '
id=$(flux batch -N1 --dump=testdump-{{id}}.tgz \
--flags=waitable --wrap true) &&
run_timeout 60 flux job wait $id &&
run_timeout 180 flux job wait $id &&
tar tvf testdump-${id}.tgz
'
test_expect_success 'flux batch: supports directives in script' '
Expand Down
2 changes: 1 addition & 1 deletion t/t2715-python-cli-cancel.t
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ test_expect_success 'flux cancel --all works with message' '
grep "cancel all" exception.out
'
test_expect_success 'the queue is empty' '
run_timeout 60 flux queue drain
run_timeout 180 flux queue drain
'
test_expect_success 'flux cancel --all --user all fails for guest' '
id=$(($(id -u)+1)) &&
Expand Down
2 changes: 1 addition & 1 deletion t/t2802-uri-cmd.t
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ test_expect_success 'start a small hierarchy of Flux instances' '
EOF
chmod +x batch.sh &&
jobid=$(flux batch -n1 batch.sh) &&
flux job wait-event -T offset -vt 30 -c 2 $jobid memo
flux job wait-event -T offset -vt 180 -c 2 $jobid memo
'
test_expect_success 'flux uri resolves jobid argument' '
flux proxy $(flux uri --local $jobid) flux getattr jobid >jobid1.out &&
Expand Down

0 comments on commit 5cd101e

Please sign in to comment.