From 80363826a990df4ea73a1b5dd74b7edd80db9c97 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 26 Oct 2023 15:43:33 -0700 Subject: [PATCH] testsuite: drop multikey tests for flux job info Problem: there are several tests for flux job info fetching multiple keys at once, but this feature is to be deprecated. Drop tests. --- t/t2230-job-info-lookup.t | 43 ---------------------------------- t/t2232-job-info-security.t | 38 ------------------------------ t/valgrind/workload.d/job-info | 4 +++- 3 files changed, 3 insertions(+), 82 deletions(-) diff --git a/t/t2230-job-info-lookup.t b/t/t2230-job-info-lookup.t index dad9d8746249..752fe1badf15 100755 --- a/t/t2230-job-info-lookup.t +++ b/t/t2230-job-info-lookup.t @@ -123,49 +123,6 @@ test_expect_success 'flux job info --base R works' ' | jq -e ".execution.expiration == 0.0" ' -# -# job info lookup tests (multiple info requests) -# - -test_expect_success 'flux job info multiple keys works (different keys)' ' - jobid=$(submit_job) && - flux job info $jobid eventlog jobspec J > all_info_a.out && - grep submit all_info_a.out && - grep sleep all_info_a.out -' - -test_expect_success 'flux job info multiple keys works (same key)' ' - jobid=$(submit_job) && - flux job info $jobid eventlog eventlog eventlog > eventlog_3.out && - test $(grep submit eventlog_3.out | wc -l) -eq 3 -' - -test_expect_success 'flux job info multiple keys fails on bad id' ' - test_must_fail flux job info 12345 eventlog jobspec J -' - -test_expect_success 'flux job info multiple keys fails on 1 bad entry (include eventlog)' ' - jobid=$(submit_job) && - kvsdir=$(flux job id --to=kvs $jobid) && - flux kvs unlink ${kvsdir}.jobspec && - test_must_fail flux job info $jobid eventlog jobspec J > all_info_b.out -' - -test_expect_success 'flux job info multiple keys fails on 1 bad entry (no eventlog)' ' - jobid=$(submit_job) && - kvsdir=$(flux job id --to=kvs $jobid) && - flux kvs unlink ${kvsdir}.jobspec && - test_must_fail flux job info $jobid jobspec J > all_info_b.out -' - -# N.B. Issue #5305, jobspec would be output twice, so we check for one -# output of jobspec -test_expect_success 'flux job info --original jobspec and J works' ' - jobid=$(flux submit --env=ORIGINALTHING=t true) && - flux job info --original $jobid J jobspec > J_jobspec_original.out && - test $(grep ORIGINALTHING J_jobspec_original.out | wc -l) -eq 1 -' - # # job info lookup tests (via eventlog) # diff --git a/t/t2232-job-info-security.t b/t/t2232-job-info-security.t index a540c994477d..1ea1a1e6065c 100755 --- a/t/t2232-job-info-security.t +++ b/t/t2232-job-info-security.t @@ -158,44 +158,6 @@ test_expect_success 'flux job info jobspec fails (wrong user)' ' unset_userid ' -test_expect_success 'flux job info multiple keys works (owner, include eventlog)' ' - jobid=$(submit_job) && - flux job info $jobid eventlog jobspec J -' - -test_expect_success 'flux job info multiple keys works (user, include eventlog)' ' - jobid=$(submit_job 9000) && - set_userid 9000 && - flux job info $jobid eventlog jobspec J && - unset_userid -' - -test_expect_success 'flux job info multiple keys fails (wrong user, include eventlog)' ' - jobid=$(submit_job 9000) && - set_userid 9999 && - ! flux job info $jobid eventlog jobspec J && - unset_userid -' - -test_expect_success 'flux job info multiple keys works (owner, no eventlog)' ' - jobid=$(submit_job) && - flux job info $jobid jobspec J -' - -test_expect_success 'flux job info multiple keys works (user, no eventlog)' ' - jobid=$(submit_job 9000) && - set_userid 9000 && - flux job info $jobid jobspec J && - unset_userid -' - -test_expect_success 'flux job info multiple keys fails (wrong user, no eventlog)' ' - jobid=$(submit_job 9000) && - set_userid 9999 && - ! flux job info $jobid jobspec J && - unset_userid -' - test_expect_success 'flux job info foobar fails (owner)' ' jobid=$(submit_job) && ! flux job info $jobid foobar diff --git a/t/valgrind/workload.d/job-info b/t/valgrind/workload.d/job-info index d77e2cb0d18a..5177914e7772 100755 --- a/t/valgrind/workload.d/job-info +++ b/t/valgrind/workload.d/job-info @@ -7,4 +7,6 @@ set -x id=$(flux submit -n 1 /bin/true) flux job attach ${id} -flux job info ${id} eventlog jobspec R >/dev/null +flux job info ${id} eventlog >/dev/null +flux job info ${id} jobspec >/dev/null +flux job info ${id} R >/dev/null