test: replace usage of 'flux job cancelall'

jameshcorbett · jameshcorbett · commit 352ea07b4c01 · 2024-03-13T18:35:01.000-07:00
Problem: 'flux job cancelall' is deprecated in favor of 'flux
cancel --all'.

Replace the usage of 'flux job cancelall'.
diff --git a/t/sharness.d/sched-sharness.sh b/t/sharness.d/sched-sharness.sh
@@ -94,7 +94,7 @@ load_test_resources () {
 # N.B. this assumes that a scheduler is loaded
 cleanup_active_jobs () {
     flux queue stop --all &&
-        flux job cancelall -f &&
+        flux cancel --all &&
         flux queue idle
 }
 
diff --git a/t/t1019-qmanager-async.t b/t/t1019-qmanager-async.t
@@ -43,7 +43,7 @@ test_expect_success 'qmanager: many basic job submitted' '
 # We don't use flux queue stop because that can lead
 # to duplicate cancel requests
 test_expect_success 'qmanager: rapidly cancel all jobs' '
-    flux job cancelall -f &&
+    flux cancel --all &&
     flux queue idle
 '
 
diff --git a/t/t1021-qmanager-nodex.t b/t/t1021-qmanager-nodex.t
@@ -84,7 +84,7 @@ EOF
 '
 
 test_expect_success 'qmanager-nodex: cancel all jobs (hinodex)' '
-    flux job cancelall -f &&
+    flux cancel --all &&
     flux queue drain
 '
 
@@ -144,7 +144,7 @@ EOF
 '
 
 test_expect_success 'qmanager-nodex: cancel all jobs (lonodex)' '
-    flux job cancelall -f &&
+    flux cancel --all &&
     flux queue drain
 '
 
diff --git a/t/t1024-alloc-check.t b/t/t1024-alloc-check.t
@@ -45,7 +45,7 @@ test_expect_success 'no jobs received alloc-check exception' '
 	test_must_fail grep "job.exception type=alloc-check" joberr
 '
 test_expect_success 'clean up' '
-	flux job cancelall -f &&
+	flux cancel --all &&
 	flux queue idle &&
 	(flux resource undrain 0 || true)
 '

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ load_test_resources () {`
`94`	`94`	`# N.B. this assumes that a scheduler is loaded`
`95`	`95`	`cleanup_active_jobs () {`
`96`	`96`	`flux queue stop --all &&`
`97`		`- flux job cancelall -f &&`
	`97`	`+ flux cancel --all &&`
`98`	`98`	`flux queue idle`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ test_expect_success 'qmanager: many basic job submitted' '`
`43`	`43`	`# We don't use flux queue stop because that can lead`
`44`	`44`	`# to duplicate cancel requests`
`45`	`45`	`test_expect_success 'qmanager: rapidly cancel all jobs' '`
`46`		`- flux job cancelall -f &&`
	`46`	`+ flux cancel --all &&`
`47`	`47`	`flux queue idle`
`48`	`48`	`'`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ EOF`
`84`	`84`	`'`
`85`	`85`
`86`	`86`	`test_expect_success 'qmanager-nodex: cancel all jobs (hinodex)' '`
`87`		`- flux job cancelall -f &&`
	`87`	`+ flux cancel --all &&`
`88`	`88`	`flux queue drain`
`89`	`89`	`'`
`90`	`90`
`@@ -144,7 +144,7 @@ EOF`
`144`	`144`	`'`
`145`	`145`
`146`	`146`	`test_expect_success 'qmanager-nodex: cancel all jobs (lonodex)' '`
`147`		`- flux job cancelall -f &&`
	`147`	`+ flux cancel --all &&`
`148`	`148`	`flux queue drain`
`149`	`149`	`'`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ test_expect_success 'no jobs received alloc-check exception' '`
`45`	`45`	`test_must_fail grep "job.exception type=alloc-check" joberr`
`46`	`46`	`'`
`47`	`47`	`test_expect_success 'clean up' '`
`48`		`- flux job cancelall -f &&`
	`48`	`+ flux cancel --all &&`
`49`	`49`	`flux queue idle &&`
`50`	`50`	`(flux resource undrain 0 \|\| true)`
`51`	`51`	`'`