From 2de4f1959c23b1aa3f0326e72a4fec69528ba8e0 Mon Sep 17 00:00:00 2001
From: Daniel Milroy <daniel.milroy@gmail.com>
Date: Mon, 24 Jun 2024 11:25:41 -0700
Subject: [PATCH] testsuite: add partial cancel tests for rv1exec

---
 t/data/resource/commands/cancel/cmds03.in     |   3 +
 t/data/resource/commands/cancel/cmds04.in     |   8 +
 t/data/resource/commands/cancel/cmds05.in     |   4 +
 t/data/resource/commands/cancel/cmds06.in     |   9 +
 t/data/resource/expected/cancel/015.R.out     |  49 +++++
 t/data/resource/expected/cancel/016.R.out     | 192 +++++++++++++++++
 t/data/resource/expected/cancel/017.R.out     |  97 +++++++++
 t/data/resource/expected/cancel/018.R.out     | 198 ++++++++++++++++++
 t/data/resource/jobspecs/cancel/test018.yaml  |  23 ++
 t/data/resource/jobspecs/cancel/test019.yaml  |  23 ++
 .../resource/rv1exec/cancel/rank1_cancel.json |   1 +
 t/t3008-resource-cancel.t                     |  46 +++-
 12 files changed, 652 insertions(+), 1 deletion(-)
 create mode 100644 t/data/resource/commands/cancel/cmds03.in
 create mode 100644 t/data/resource/commands/cancel/cmds04.in
 create mode 100644 t/data/resource/commands/cancel/cmds05.in
 create mode 100644 t/data/resource/commands/cancel/cmds06.in
 create mode 100644 t/data/resource/expected/cancel/015.R.out
 create mode 100644 t/data/resource/expected/cancel/016.R.out
 create mode 100644 t/data/resource/expected/cancel/017.R.out
 create mode 100644 t/data/resource/expected/cancel/018.R.out
 create mode 100644 t/data/resource/jobspecs/cancel/test018.yaml
 create mode 100644 t/data/resource/jobspecs/cancel/test019.yaml
 create mode 100644 t/data/resource/rv1exec/cancel/rank1_cancel.json

diff --git a/t/data/resource/commands/cancel/cmds03.in b/t/data/resource/commands/cancel/cmds03.in
new file mode 100644
index 000000000..125855dc1
--- /dev/null
+++ b/t/data/resource/commands/cancel/cmds03.in
@@ -0,0 +1,3 @@
+match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/cancel/test018.yaml
+partial-cancel 1 foo @TEST_SRCDIR@/data/resource/rv1exec/cancel/rank1_cancel.json
+quit
diff --git a/t/data/resource/commands/cancel/cmds04.in b/t/data/resource/commands/cancel/cmds04.in
new file mode 100644
index 000000000..2eb1028d5
--- /dev/null
+++ b/t/data/resource/commands/cancel/cmds04.in
@@ -0,0 +1,8 @@
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/cancel/test018.yaml
+find sched-now=allocated
+partial-cancel 1 rv1exec @TEST_SRCDIR@/data/resource/rv1exec/cancel/rank1_cancel.json
+find sched-now=allocated
+info 1
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/cancel/test019.yaml
+find sched-now=allocated
+quit
diff --git a/t/data/resource/commands/cancel/cmds05.in b/t/data/resource/commands/cancel/cmds05.in
new file mode 100644
index 000000000..62b647b2a
--- /dev/null
+++ b/t/data/resource/commands/cancel/cmds05.in
@@ -0,0 +1,4 @@
+match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/cancel/test018.yaml
+match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/cancel/test018.yaml
+partial-cancel 2 rv1exec @TEST_SRCDIR@/data/resource/rv1exec/cancel/rank1_cancel.json
+quit
diff --git a/t/data/resource/commands/cancel/cmds06.in b/t/data/resource/commands/cancel/cmds06.in
new file mode 100644
index 000000000..bf6981fe5
--- /dev/null
+++ b/t/data/resource/commands/cancel/cmds06.in
@@ -0,0 +1,9 @@
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/cancel/test019.yaml
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/cancel/test019.yaml
+find sched-now=allocated
+partial-cancel 2 rv1exec @TEST_SRCDIR@/data/resource/rv1exec/cancel/rank1_cancel.json
+find sched-now=allocated
+info 2
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/cancel/test019.yaml
+find sched-now=allocated
+quit
diff --git a/t/data/resource/expected/cancel/015.R.out b/t/data/resource/expected/cancel/015.R.out
new file mode 100644
index 000000000..664bf95dc
--- /dev/null
+++ b/t/data/resource/expected/cancel/015.R.out
@@ -0,0 +1,49 @@
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:s]
+INFO: =============================
+INFO: JOBID=1
+INFO: RESOURCES=ALLOCATED
+INFO: SCHEDULED AT=Now
+INFO: =============================
+ERROR: unsupported reader foo
diff --git a/t/data/resource/expected/cancel/016.R.out b/t/data/resource/expected/cancel/016.R.out
new file mode 100644
index 000000000..e41affc63
--- /dev/null
+++ b/t/data/resource/expected/cancel/016.R.out
@@ -0,0 +1,192 @@
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:s]
+INFO: =============================
+INFO: JOBID=1
+INFO: RESOURCES=ALLOCATED
+INFO: SCHEDULED AT=Now
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:x]
+INFO: =============================
+INFO: EXPRESSION="sched-now=allocated"
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---cluster0[1:x]
+INFO: =============================
+INFO: EXPRESSION="sched-now=allocated"
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:s]
+INFO: =============================
+INFO: JOBID=2
+INFO: RESOURCES=ALLOCATED
+INFO: SCHEDULED AT=Now
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:x]
+INFO: =============================
+INFO: EXPRESSION="sched-now=allocated"
+INFO: =============================
diff --git a/t/data/resource/expected/cancel/017.R.out b/t/data/resource/expected/cancel/017.R.out
new file mode 100644
index 000000000..e3f55593a
--- /dev/null
+++ b/t/data/resource/expected/cancel/017.R.out
@@ -0,0 +1,97 @@
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:s]
+INFO: =============================
+INFO: JOBID=1
+INFO: RESOURCES=ALLOCATED
+INFO: SCHEDULED AT=Now
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:s]
+INFO: =============================
+INFO: JOBID=2
+INFO: RESOURCES=RESERVED
+INFO: SCHEDULED AT=3600
+INFO: =============================
+ERROR: reservations not currently supported by partial cancel
diff --git a/t/data/resource/expected/cancel/018.R.out b/t/data/resource/expected/cancel/018.R.out
new file mode 100644
index 000000000..6970ba3d0
--- /dev/null
+++ b/t/data/resource/expected/cancel/018.R.out
@@ -0,0 +1,198 @@
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---cluster0[1:s]
+INFO: =============================
+INFO: JOBID=1
+INFO: RESOURCES=ALLOCATED
+INFO: SCHEDULED AT=Now
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:s]
+INFO: =============================
+INFO: JOBID=2
+INFO: RESOURCES=ALLOCATED
+INFO: SCHEDULED AT=Now
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:x]
+INFO: =============================
+INFO: EXPRESSION="sched-now=allocated"
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---cluster0[1:x]
+INFO: =============================
+INFO: EXPRESSION="sched-now=allocated"
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:s]
+INFO: =============================
+INFO: JOBID=3
+INFO: RESOURCES=ALLOCATED
+INFO: SCHEDULED AT=Now
+INFO: =============================
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node0[1:x]
+      ---------core0[1:x]
+      ---------core1[1:x]
+      ---------core2[1:x]
+      ---------core3[1:x]
+      ---------core4[1:x]
+      ---------core5[1:x]
+      ---------core6[1:x]
+      ---------core7[1:x]
+      ---------core8[1:x]
+      ---------core9[1:x]
+      ---------core10[1:x]
+      ---------core11[1:x]
+      ---------core12[1:x]
+      ---------core13[1:x]
+      ---------core14[1:x]
+      ---------core15[1:x]
+      ---------gpu0[1:x]
+      ---------gpu1[1:x]
+      ---------gpu2[1:x]
+      ---------gpu3[1:x]
+      ------node1[1:x]
+      ---cluster0[1:x]
+INFO: =============================
+INFO: EXPRESSION="sched-now=allocated"
+INFO: =============================
diff --git a/t/data/resource/jobspecs/cancel/test018.yaml b/t/data/resource/jobspecs/cancel/test018.yaml
new file mode 100644
index 000000000..1084f8dfc
--- /dev/null
+++ b/t/data/resource/jobspecs/cancel/test018.yaml
@@ -0,0 +1,23 @@
+version: 9999
+resources:
+    - type: slot
+      count: 2
+      label: default
+      with:
+        - type: node
+          count: 1
+          with:
+            - type: core
+              count: 16
+            - type: gpu
+              count: 4
+# a comment
+attributes:
+  system:
+    duration: 3600
+tasks:
+  - command: [ "app" ]
+    slot: default
+    count:
+      per_slot: 1
+
diff --git a/t/data/resource/jobspecs/cancel/test019.yaml b/t/data/resource/jobspecs/cancel/test019.yaml
new file mode 100644
index 000000000..cd09981ad
--- /dev/null
+++ b/t/data/resource/jobspecs/cancel/test019.yaml
@@ -0,0 +1,23 @@
+version: 9999
+resources:
+    - type: slot
+      count: 1
+      label: default
+      with:
+        - type: node
+          count: 1
+          with:
+            - type: core
+              count: 16
+            - type: gpu
+              count: 4
+# a comment
+attributes:
+  system:
+    duration: 3600
+tasks:
+  - command: [ "app" ]
+    slot: default
+    count:
+      per_slot: 1
+
diff --git a/t/data/resource/rv1exec/cancel/rank1_cancel.json b/t/data/resource/rv1exec/cancel/rank1_cancel.json
new file mode 100644
index 000000000..5e5db17ea
--- /dev/null
+++ b/t/data/resource/rv1exec/cancel/rank1_cancel.json
@@ -0,0 +1 @@
+{"version": 1, "execution": {"R_lite": [{"rank": "1", "children": {"core": "0-15", "gpu": "0-3"}}], "nodelist": ["node1"], "starttime": 0, "expiration": 1000000}}
diff --git a/t/t3008-resource-cancel.t b/t/t3008-resource-cancel.t
index 1c89e9b70..c927c0951 100755
--- a/t/t3008-resource-cancel.t
+++ b/t/t3008-resource-cancel.t
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-test_description='Test reservations of jobs of varying geometries and durations'
+test_description='Test cancellation of jobs of varying geometries and durations'
 
 . $(dirname $0)/sharness.sh
 
 cmd_dir="${SHARNESS_TEST_SRCDIR}/data/resource/commands/cancel"
 exp_dir="${SHARNESS_TEST_SRCDIR}/data/resource/expected/cancel"
 grugs="${SHARNESS_TEST_SRCDIR}/data/resource/grugs/resv_test.graphml"
+rv1s="${SHARNESS_TEST_SRCDIR}/data/resource/rv1exec/tiny_rv1exec.json"
 query="../../resource/utilities/resource-query"
 
 #
@@ -117,4 +118,47 @@ test_expect_success "${test014_desc}" '
     test_cmp 014.R.out ${exp_dir}/014.R.out
 '
 
+# Partial cancel/release -- Use low node policy
+#     Tests to ensure correctness of partial cancel/release behavior
+
+cmds015="${cmd_dir}/cmds03.in"
+test015_desc="test reader file option"
+test_expect_success "${test015_desc}" '
+    sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds015} > cmds015 &&
+    ${query} -f rv1exec -L ${rv1s} -S CA -P low -t 015.R.out < cmds015 2>> 015.R.out &&
+    test_cmp 015.R.out ${exp_dir}/015.R.out
+'
+
+cmds016="${cmd_dir}/cmds04.in"
+test016_desc="test partial cancel and reallocation of one rank"
+test_expect_success "${test016_desc}" '
+    sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds016} > cmds016 &&
+    ${query} -f rv1exec -L ${rv1s} -S CA -P low -t 016.R.out < cmds016 &&
+    test_cmp 016.R.out ${exp_dir}/016.R.out
+'
+
+cmds017="${cmd_dir}/cmds05.in"
+test017_desc="check for unsupported partial cancel of reservation"
+test_expect_success "${test017_desc}" '
+    sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds017} > cmds017 &&
+    ${query} -f rv1exec -L ${rv1s} -S CA -P low -t 017.R.out < cmds017 2>> 017.R.out &&
+    test_cmp 017.R.out ${exp_dir}/017.R.out
+'
+
+cmds018="${cmd_dir}/cmds06.in"
+test018_desc="partial cancel of full allocation is the same as full cancel"
+test_expect_success "${test018_desc}" '
+    sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds018} > cmds018 &&
+    ${query} -f rv1exec -L ${rv1s} -S CA -P low -t 018.R.out < cmds018 &&
+    test_cmp 018.R.out ${exp_dir}/018.R.out
+'
+
+cmds019="${cmd_dir}/cmds06.in"
+test019_desc="partial cancel of full allocation is the same as full cancel with all pruning filters set"
+test_expect_success "${test019_desc}" '
+    sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds019} > cmds019 &&
+    ${query} -f rv1exec -L ${rv1s} -S CA -P low --prune-filters=ALL:core,ALL:node,ALL:gpu -t 019.R.out < cmds019 &&
+    test_cmp 019.R.out ${exp_dir}/018.R.out
+'
+
 test_done