Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

t: update job.exception output checks #1315

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions t/t1006-qmanager-multiqueue.t
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ test_expect_success 'reconfigure with one queue and load qmanager' '
'
test_expect_success 'job submitted with no queue gets fatal exception' '
test_must_fail flux job attach $(cat noqueue.jobid) 2>noqueue.err &&
grep "job.exception type=alloc severity=0" noqueue.err
grep "job.exception" noqueue.err | grep "type=alloc severity=0"
'
test_expect_success 'unload qmanager' '
remove_qmanager
Expand All @@ -157,7 +157,7 @@ test_expect_success 'deconfigure queues and load qmanager' '
'
test_expect_success 'job submitted with queue gets fatal exception' '
test_must_fail flux job attach $(cat withqueue.jobid) 2>foo.err &&
grep "job.exception type=alloc severity=0 queue" foo.err
grep "job.exception" foo.err | grep "type=alloc severity=0 queue"
'

test_expect_success 'cleanup active jobs' '
Expand Down
8 changes: 4 additions & 4 deletions t/t1024-alloc-check.t
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ test_expect_success 'submit node-exclusive jobs that exceed their time limit' '
done) 2>joberr
'
test_expect_success 'some jobs received timeout exception' '
grep "job.exception type=timeout" joberr
grep "job.exception" joberr | grep "type=timeout"
'
test_expect_success 'no jobs received alloc-check exception' '
test_must_fail grep "job.exception type=alloc-check" joberr
test_must_fail grep "job.exception.*type=alloc-check" joberr
'
test_expect_success 'clean up' '
flux cancel --all &&
Expand All @@ -57,10 +57,10 @@ test_expect_success 'submit non-exclusive jobs that exceed their time limit' '
done) 2>joberr2
'
test_expect_success 'some jobs received timeout exception' '
grep "job.exception type=timeout" joberr2
grep "job.exception" joberr2 | grep "type=timeout"
'
test_expect_success 'no jobs received alloc-check exception' '
test_must_fail grep "job.exception type=alloc-check" joberr2
test_must_fail grep "job.exception.*type=alloc-check" joberr2
'
test_expect_success 'clean up' '
flux cancel --all &&
Expand Down
Loading