testsuite: updated tests for planner correctness

Add tests for attaching a new subgraph to an
instantiated resource graph and ensure the
allocations and reservations are not affected.
Test that the match policy selects appropriate
resources from the newly added subgraph.

t/data/resource/commands/elastic/cmds04.in

@@ -1,3 +1,13 @@
-attach @TEST_SRCDIR@/data/resource/jgfs/power.json
+find sched-now=free
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
 find status=up
+find sched-now=allocated
+find sched-future=reserved
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+attach @TEST_SRCDIR@/data/resource/jgfs/elastic/node-add-test.json
+find status=up
+find sched-now=allocated
+find sched-future=reserved
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
 quit

t/data/resource/commands/elastic/cmds05.in

@@ -1,4 +1,3 @@
-attach @TEST_SRCDIR@/data/resource/jgfs/elastic/node-test.json
+attach @TEST_SRCDIR@/data/resource/jgfs/power.json
 find status=up
-find sched-now=allocated
 quit

t/data/resource/commands/elastic/cmds06.in

@@ -1,4 +1,4 @@
-attach @TEST_SRCDIR@/data/resource/jgfs/elastic/dne.json invalid-option
+attach @TEST_SRCDIR@/data/resource/jgfs/elastic/node-test.json
 find status=up
 find sched-now=allocated
 quit

t/data/resource/commands/elastic/cmds07.in

@@ -1,4 +1,4 @@
-attach @TEST_SRCDIR@/data/resource/jgfs/elastic/dne.json
+attach @TEST_SRCDIR@/data/resource/jgfs/elastic/dne.json invalid-option
 find status=up
 find sched-now=allocated
 quit

t/data/resource/commands/elastic/cmds08.in

@@ -0,0 +1,4 @@
+attach @TEST_SRCDIR@/data/resource/jgfs/elastic/dne.json
+find status=up
+find sched-now=allocated
+quit

t/data/resource/expected/elastic/005.R.out

@@ -2,6 +2,3 @@
 INFO: =============================
 INFO: EXPRESSION="status=up"
 INFO: =============================
-INFO: =============================
-INFO: EXPRESSION="sched-now=allocated"
-INFO: =============================

t/data/resource/expected/elastic/007.R.err

@@ -1 +1 @@
-ERROR: can't open @TEST_SRCDIR@/data/resource/jgfs/elastic/dne.json
+ERROR: malformed command

t/data/resource/expected/elastic/008.R.err

@@ -0,0 +1 @@
+ERROR: can't open @TEST_SRCDIR@/data/resource/jgfs/elastic/dne.json

t/data/resource/expected/elastic/008.R.out

@@ -0,0 +1,7 @@
+{"graph": {"nodes": [{"id": "221", "metadata": {"type": "core", "basename": "core", "name": "core0", "id": 0, "uniq_id": 221, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core0"}}}, {"id": "222", "metadata": {"type": "core", "basename": "core", "name": "core1", "id": 1, "uniq_id": 222, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core1"}}}, {"id": "223", "metadata": {"type": "core", "basename": "core", "name": "core2", "id": 2, "uniq_id": 223, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core2"}}}, {"id": "224", "metadata": {"type": "core", "basename": "core", "name": "core3", "id": 3, "uniq_id": 224, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core3"}}}, {"id": "225", "metadata": {"type": "core", "basename": "core", "name": "core4", "id": 4, "uniq_id": 225, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core4"}}}, {"id": "226", "metadata": {"type": "core", "basename": "core", "name": "core5", "id": 5, "uniq_id": 226, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core5"}}}, {"id": "227", "metadata": {"type": "core", "basename": "core", "name": "core6", "id": 6, "uniq_id": 227, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core6"}}}, {"id": "228", "metadata": {"type": "core", "basename": "core", "name": "core7", "id": 7, "uniq_id": 228, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core7"}}}, {"id": "229", "metadata": {"type": "core", "basename": "core", "name": "core8", "id": 8, "uniq_id": 229, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core8"}}}, {"id": "230", "metadata": {"type": "core", "basename": "core", "name": "core9", "id": 9, "uniq_id": 230, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core9"}}}, {"id": "231", "metadata": {"type": "core", "basename": "core", "name": "core10", "id": 10, "uniq_id": 231, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core10"}}}, {"id": "232", "metadata": {"type": "core", "basename": "core", "name": "core11", "id": 11, "uniq_id": 232, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core11"}}}, {"id": "233", "metadata": {"type": "core", "basename": "core", "name": "core12", "id": 12, "uniq_id": 233, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core12"}}}, {"id": "234", "metadata": {"type": "core", "basename": "core", "name": "core13", "id": 13, "uniq_id": 234, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core13"}}}, {"id": "235", "metadata": {"type": "core", "basename": "core", "name": "core14", "id": 14, "uniq_id": 235, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core14"}}}, {"id": "236", "metadata": {"type": "core", "basename": "core", "name": "core15", "id": 15, "uniq_id": 236, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core15"}}}, {"id": "237", "metadata": {"type": "core", "basename": "core", "name": "core16", "id": 16, "uniq_id": 237, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core16"}}}, {"id": "238", "metadata": {"type": "core", "basename": "core", "name": "core17", "id": 17, "uniq_id": 238, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0/core17"}}}, {"id": "77", "metadata": {"type": "socket", "basename": "socket", "name": "socket0", "id": 0, "uniq_id": 77, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket0"}}}, {"id": "239", "metadata": {"type": "core", "basename": "core", "name": "core18", "id": 18, "uniq_id": 239, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core18"}}}, {"id": "240", "metadata": {"type": "core", "basename": "core", "name": "core19", "id": 19, "uniq_id": 240, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core19"}}}, {"id": "241", "metadata": {"type": "core", "basename": "core", "name": "core20", "id": 20, "uniq_id": 241, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core20"}}}, {"id": "242", "metadata": {"type": "core", "basename": "core", "name": "core21", "id": 21, "uniq_id": 242, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core21"}}}, {"id": "243", "metadata": {"type": "core", "basename": "core", "name": "core22", "id": 22, "uniq_id": 243, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core22"}}}, {"id": "244", "metadata": {"type": "core", "basename": "core", "name": "core23", "id": 23, "uniq_id": 244, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core23"}}}, {"id": "245", "metadata": {"type": "core", "basename": "core", "name": "core24", "id": 24, "uniq_id": 245, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core24"}}}, {"id": "246", "metadata": {"type": "core", "basename": "core", "name": "core25", "id": 25, "uniq_id": 246, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core25"}}}, {"id": "247", "metadata": {"type": "core", "basename": "core", "name": "core26", "id": 26, "uniq_id": 247, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core26"}}}, {"id": "248", "metadata": {"type": "core", "basename": "core", "name": "core27", "id": 27, "uniq_id": 248, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core27"}}}, {"id": "249", "metadata": {"type": "core", "basename": "core", "name": "core28", "id": 28, "uniq_id": 249, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core28"}}}, {"id": "250", "metadata": {"type": "core", "basename": "core", "name": "core29", "id": 29, "uniq_id": 250, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core29"}}}, {"id": "251", "metadata": {"type": "core", "basename": "core", "name": "core30", "id": 30, "uniq_id": 251, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core30"}}}, {"id": "252", "metadata": {"type": "core", "basename": "core", "name": "core31", "id": 31, "uniq_id": 252, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core31"}}}, {"id": "253", "metadata": {"type": "core", "basename": "core", "name": "core32", "id": 32, "uniq_id": 253, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core32"}}}, {"id": "254", "metadata": {"type": "core", "basename": "core", "name": "core33", "id": 33, "uniq_id": 254, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core33"}}}, {"id": "255", "metadata": {"type": "core", "basename": "core", "name": "core34", "id": 34, "uniq_id": 255, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core34"}}}, {"id": "256", "metadata": {"type": "core", "basename": "core", "name": "core35", "id": 35, "uniq_id": 256, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1/core35"}}}, {"id": "78", "metadata": {"type": "socket", "basename": "socket", "name": "socket1", "id": 1, "uniq_id": 78, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0/socket1"}}}, {"id": "5", "metadata": {"type": "node", "basename": "node", "name": "node0", "id": 0, "uniq_id": 5, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0/node0"}}}, {"id": "1", "metadata": {"type": "rack", "basename": "rack", "name": "rack0", "id": 0, "uniq_id": 1, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0/rack0"}}}, {"id": "0", "metadata": {"type": "cluster", "basename": "medium", "name": "medium0", "id": 0, "uniq_id": 0, "rank": -1, "exclusive": true, "unit": "", "size": 1, "paths": {"containment": "/medium0"}}}], "edges": [{"source": "77", "target": "221", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "222", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "223", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "224", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "225", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "226", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "227", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "228", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "229", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "230", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "231", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "232", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "233", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "234", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "235", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "236", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "237", "metadata": {"name": {"containment": "contains"}}}, {"source": "77", "target": "238", "metadata": {"name": {"containment": "contains"}}}, {"source": "5", "target": "77", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "239", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "240", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "241", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "242", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "243", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "244", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "245", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "246", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "247", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "248", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "249", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "250", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "251", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "252", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "253", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "254", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "255", "metadata": {"name": {"containment": "contains"}}}, {"source": "78", "target": "256", "metadata": {"name": {"containment": "contains"}}}, {"source": "5", "target": "78", "metadata": {"name": {"containment": "contains"}}}, {"source": "1", "target": "5", "metadata": {"name": {"containment": "contains"}}}, {"source": "0", "target": "1", "metadata": {"name": {"containment": "contains"}}}]}}
+INFO: =============================
+INFO: EXPRESSION="status=up"
+INFO: =============================
+INFO: =============================
+INFO: EXPRESSION="sched-now=allocated"
+INFO: =============================

t/t3028-resource-grow.t

@@ -13,7 +13,7 @@ cmds001="${cmd_dir}/cmds01.in"
 test001_desc="fully allocate node and grow job with new resources"
 test_expect_success "${test001_desc}" '
     sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds001} > cmds001 &&
-    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 001.R.out -r 2000 \
+    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 001.R.out \
     < cmds001 &&
     test_cmp 001.R.out ${exp_dir}/001.R.out
 '
@@ -22,60 +22,68 @@ cmds002="${cmd_dir}/cmds02.in"
 test002_desc="fully allocate node and grow job from randomized JGF"
 test_expect_success "${test002_desc}" '
     sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds002} > cmds002 &&
-    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 002.R.out -r 2000 \
+    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 002.R.out \
     < cmds002 &&
     test_cmp 002.R.out ${exp_dir}/002.R.out
 '
 
 cmds003="${cmd_dir}/cmds03.in"
-test003_desc="ensure attach with allocated vertices can't change allocations"
+test003_desc="attach with allocated vertices doesn't affect planner"
 test_expect_success "${test003_desc}" '
     sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds003} > cmds003 &&
-    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 003.R.out -r 2000 \
-    < cmds003 2> 003.R.err &&
-    test_cmp 003.R.out ${exp_dir}/003.R.out &&
-    test_cmp 003.R.err ${exp_dir}/003.R.err
+    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 003.R.out \
+    < cmds003 &&
+    test_cmp 003.R.out ${exp_dir}/003.R.out
 '
 
 cmds004="${cmd_dir}/cmds04.in"
-test004_desc="can't grow with a different root in the subgraph"
+test004_desc="attach with allocated, reserved vertices doesn't affect planner"
 test_expect_success "${test004_desc}" '
     sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds004} > cmds004 &&
-    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 004.R.out -r 2000 \
-    < cmds004 2> 004.R.err &&
-    test_cmp 004.R.out ${exp_dir}/004.R.out &&
-    test_cmp 004.R.err ${exp_dir}/004.R.err
+    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 004.R.out \
+    < cmds004 &&
+    test_cmp 004.R.out ${exp_dir}/004.R.out
 '
 
 cmds005="${cmd_dir}/cmds05.in"
-test005_desc="grow with subset of resource graph doesn't change resource graph"
+test005_desc="can't grow with a different root in the subgraph"
 test_expect_success "${test005_desc}" '
     sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds005} > cmds005 &&
-    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 005.R.out -r 2000 \
-    < cmds005 &&
-    test_cmp 005.R.out ${exp_dir}/005.R.out
+    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 005.R.out \
+    < cmds005 2> 005.R.err &&
+    test_cmp 005.R.out ${exp_dir}/005.R.out &&
+    test_cmp 005.R.err ${exp_dir}/005.R.err
 '
 
 cmds006="${cmd_dir}/cmds06.in"
-test006_desc="error on invalid argument"
+test006_desc="grow with subset of resource graph doesn't change resource graph"
 test_expect_success "${test006_desc}" '
     sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds006} > cmds006 &&
     ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 006.R.out \
-    < cmds006 2> 006.R.err &&
-    test_cmp 006.R.out ${exp_dir}/006.R.out &&
-    test_cmp 006.R.err ${exp_dir}/006.R.err
+    < cmds006 &&
+    test_cmp 006.R.out ${exp_dir}/006.R.out
 '
 
 cmds007="${cmd_dir}/cmds07.in"
-err007="${exp_dir}/007.R.err"
-test007_desc="error on nonexistent JGF"
+test007_desc="error on invalid argument"
 test_expect_success "${test007_desc}" '
     sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds007} > cmds007 &&
-    sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${err007} > 007.R.err &&
     ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 007.R.out \
-    < cmds007 2> 007.R.new_err &&
+    < cmds007 2> 007.R.err &&
     test_cmp 007.R.out ${exp_dir}/007.R.out &&
-    test_cmp 007.R.new_err 007.R.err
+    test_cmp 007.R.err ${exp_dir}/007.R.err
+'
+
+cmds008="${cmd_dir}/cmds08.in"
+err008="${exp_dir}/008.R.err"
+test008_desc="error on nonexistent JGF"
+test_expect_success "${test008_desc}" '
+    sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds008} > cmds008 &&
+    sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${err008} > 008.R.err &&
+    ${query} -L ${jgf} -F jgf -f jgf -S CA -P low -t 008.R.out \
+    < cmds008 2> 008.R.new_err &&
+    test_cmp 008.R.out ${exp_dir}/008.R.out &&
+    test_cmp 008.R.new_err 008.R.err
 '
 
 test_done