Skip to content

Commit

Permalink
test: reduce timeouts in t1018
Browse files Browse the repository at this point in the history
Problem: the timeouts waiting for files to appear in t1018 are
incredibly long. If the file is going to appear, it should appear
within twenty seconds.

Reduce the timeout from 10 minutes to 20 seconds.
  • Loading branch information
jameshcorbett committed Sep 30, 2024
1 parent 732d811 commit dbe9971
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions t/t1018-rv1-bootstrap2.t
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ EOF
test_expect_success 'rv1-bootstrap: resource idempotency preserved' '
JOBID=$(flux batch -n4 -N4 -c44 -g4 \
./nest.sh high 4 4 44 4 nest.json) &&
$WAITFILE -t 600 -v -p \"R_lite\" nest.json &&
$WAITFILE -t 20 -v -p \"R_lite\" nest.json &&
jq -S " del(.execution.starttime, .execution.expiration) " \
nest.json > nest.norm.json &&
flux job info ${JOBID} R | \
Expand All @@ -63,7 +63,7 @@ test_expect_success 'rv1-bootstrap2: killing a nested job works' '
test_expect_success 'rv1-bootstrap2: 2N nesting works (policy=high)' '
JOBID1=$(flux batch -n2 -N2 -c44 -g4 \
./nest.sh high 2 2 44 4 nest1.json) &&
$WAITFILE -t 600 -v -p \"R_lite\" nest1.json &&
$WAITFILE -t 20 -v -p \"R_lite\" nest1.json &&
remap_rv1_resource_type nest1.json core > nest1.csv &&
remap_rv1_resource_type nest1.json gpu > nest1.gpu.csv &&
flux job info ${JOBID1} R | jq . > job1.json &&
Expand All @@ -77,7 +77,7 @@ test_expect_success 'rv1-bootstrap2: 2N nesting works (policy=high)' '
test_expect_success 'rv1-bootstrap2: 2 partial node nesting works (high)' '
JOBID2=$(flux batch -n2 -N2 -c10 -g2 \
./nest.sh high 2 2 10 2 nest2.json) &&
$WAITFILE -t 600 -v -p \"R_lite\" nest2.json &&
$WAITFILE -t 20 -v -p \"R_lite\" nest2.json &&
flux job info ${JOBID2} R | jq . > job2.json &&
remap_rv1_resource_type nest2.json core > nest2.csv &&
remap_rv1_resource_type nest2.json gpu > nest2.gpu.csv &&
Expand All @@ -91,8 +91,8 @@ test_expect_success 'rv1-bootstrap2: 2 partial node nesting works (high)' '
test_expect_success 'rv1-bootstrap2: killing nested jobs works' '
flux cancel ${JOBID1} &&
flux cancel ${JOBID2} &&
flux job wait-event -t600 ${JOBID1} release &&
flux job wait-event -t600 ${JOBID2} release
flux job wait-event -t20 ${JOBID1} release &&
flux job wait-event -t20 ${JOBID2} release
'

test_expect_success 'rv1-bootstrap2: remove fluxion schedulers' '
Expand All @@ -110,7 +110,7 @@ match-format=rv1 policy=low &&
test_expect_success 'rv1-bootstrap2: 2N nesting works (policy=low)' '
JOBID3=$(flux batch -n2 -N2 -c44 -g4 \
./nest.sh low 2 2 44 4 nest3.json) &&
$WAITFILE -t 600 -v -p \"R_lite\" nest3.json &&
$WAITFILE -t 20 -v -p \"R_lite\" nest3.json &&
remap_rv1_resource_type nest3.json core > nest3.csv &&
remap_rv1_resource_type nest3.json gpu > nest3.gpu.csv &&
flux job info ${JOBID3} R | jq . > job3.json &&
Expand All @@ -123,7 +123,7 @@ test_expect_success 'rv1-bootstrap2: 2N nesting works (policy=low)' '
test_expect_success 'rv1-bootstrap2: 2 partial node nesting works (low)' '
JOBID4=$(flux batch -n2 -N2 -c10 -g2 \
./nest.sh low 2 2 10 2 nest4.json) &&
$WAITFILE -t 600 -v -p \"R_lite\" nest4.json &&
$WAITFILE -t 20 -v -p \"R_lite\" nest4.json &&
flux job info ${JOBID4} R | jq . > job4.json &&
remap_rv1_resource_type nest4.json core > nest4.csv &&
remap_rv1_resource_type nest4.json gpu > nest4.gpu.csv &&
Expand All @@ -137,8 +137,8 @@ test_expect_success 'rv1-bootstrap2: 2 partial node nesting works (low)' '
test_expect_success 'rv1-bootstrap2: killing nested jobs works' '
flux cancel ${JOBID3} &&
flux cancel ${JOBID4} &&
flux job wait-event -t 600 ${JOBID3} release &&
flux job wait-event -t 600 ${JOBID4} release
flux job wait-event -t 20 ${JOBID3} release &&
flux job wait-event -t 20 ${JOBID4} release
'

test_expect_success 'rv1-bootstrap2: creating doubly nested batch script' '
Expand All @@ -153,9 +153,9 @@ load-allowlist=cluster,node,gpu,core match-format=rv1 policy=\$1
./nest.sh \$1 \$2 \$3 \${hc} \${hg} \$8)
job2=\$(flux batch -n\$2 -N\$3 -c\${hc} -g\${hg} \
./nest.sh \$1 \$2 \$3 \${hc} \${hg} \$9)
\$WAITFILE -t 600 -v -p \"R_lite\" \$8
\$WAITFILE -t 20 -v -p \"R_lite\" \$8
flux job info \${job1} R > \$6
\$WAITFILE -t 600 -v -p \"R_lite\" \$9
\$WAITFILE -t 20 -v -p \"R_lite\" \$9
flux job info \${job2} R > \$7
sleep inf
EOF
Expand All @@ -165,8 +165,8 @@ EOF
test_expect_success 'rv1-bootstrap2: double nesting works' '
JOBID5=$(flux batch -n2 -N2 -c10 -g2 ./dnest.sh low 2 2 10 2 \
job5.1.json job5.2.json nest5.1.json nest5.2.json) &&
$WAITFILE -t 600 -v -p \"R_lite\" job5.1.json &&
$WAITFILE -t 600 -v -p \"R_lite\" job5.2.json &&
$WAITFILE -t 20 -v -p \"R_lite\" job5.1.json &&
$WAITFILE -t 20 -v -p \"R_lite\" job5.2.json &&
remap_rv1_resource_type nest5.1.json core > nest5.1.csv &&
remap_rv1_resource_type nest5.1.json gpu > nest5.1.gpu.csv &&
remap_rv1_resource_type nest5.2.json core > nest5.2.csv &&
Expand All @@ -180,7 +180,7 @@ test_expect_success 'rv1-bootstrap2: double nesting works' '
# Cancel jobs
test_expect_success 'rv1-bootstrap2: killing doubly nested jobs works' '
flux cancel ${JOBID5} &&
flux job wait-event -t 600 ${JOBID5} release
flux job wait-event -t 20 ${JOBID5} release
'

test_expect_success 'rv1-bootstrap2: removing resource/qmanager modules' '
Expand Down

0 comments on commit dbe9971

Please sign in to comment.