Skip to content

Commit 416c59a

Browse files
milroymilroy
committed
testsuite: update existing tests, add checks for update under rv1exec
Problem: the current tests for reloading Fluxion with rv1exec fail due to lack of update support. Now that the support is added, we need tests for correct behavior. Add new tests to check for ability to reload Fluxion and update a resource graph with rv1exec. Update existing tests to use the additional option required by resource-query for update.
1 parent 8d4da87 commit 416c59a

17 files changed

+359
-60
lines changed

‎t/data/resource/expected/update/014.R.out‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---------core0[1:x]
2+
---------core1[1:x]
3+
---------core2[1:x]
4+
---------core3[1:x]
5+
---------core4[1:x]
6+
---------core5[1:x]
7+
---------core6[1:x]
8+
---------core7[1:x]
9+
---------core8[1:x]
10+
---------core9[1:x]
11+
---------core10[1:x]
12+
---------core11[1:x]
13+
---------core12[1:x]
14+
---------core13[1:x]
15+
---------core14[1:x]
16+
---------core15[1:x]
17+
---------gpu0[1:x]
18+
---------gpu1[1:x]
19+
---------gpu2[1:x]
20+
---------gpu3[1:x]
21+
------node[1:x]
22+
---cluster0[1:s]
23+
INFO: =============================
24+
INFO: JOBID=1
25+
INFO: RESOURCES=ALLOCATED
26+
INFO: SCHEDULED AT=Now
27+
INFO: =============================
28+
---------core0[1:x]
29+
---------core1[1:x]
30+
---------core2[1:x]
31+
---------core3[1:x]
32+
---------core4[1:x]
33+
---------core5[1:x]
34+
---------core6[1:x]
35+
---------core7[1:x]
36+
---------core8[1:x]
37+
---------core9[1:x]
38+
---------core10[1:x]
39+
---------core11[1:x]
40+
---------core12[1:x]
41+
---------core13[1:x]
42+
---------core14[1:x]
43+
---------core15[1:x]
44+
---------gpu0[1:x]
45+
---------gpu1[1:x]
46+
---------gpu2[1:x]
47+
---------gpu3[1:x]
48+
------node[1:x]
49+
---cluster0[1:s]
50+
INFO: =============================
51+
INFO: JOBID=2
52+
INFO: RESOURCES=ALLOCATED
53+
INFO: SCHEDULED AT=Now
54+
INFO: =============================
55+
---cluster0[1:x]
56+
INFO: =============================
57+
INFO: EXPRESSION="sched-now=free"
58+
INFO: =============================

‎t/data/resource/expected/update/015.R.out‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---------core0[1:x]
2+
---------core1[1:x]
3+
---------core2[1:x]
4+
---------core3[1:x]
5+
---------core4[1:x]
6+
---------core5[1:x]
7+
---------core6[1:x]
8+
---------core7[1:x]
9+
---------gpu0[1:x]
10+
---------gpu1[1:x]
11+
------node[1:x]
12+
---------core8[1:x]
13+
---------core9[1:x]
14+
---------core10[1:x]
15+
---------core11[1:x]
16+
---------core12[1:x]
17+
---------core13[1:x]
18+
---------core14[1:x]
19+
---------core15[1:x]
20+
---------gpu2[1:x]
21+
---------gpu3[1:x]
22+
------node[1:x]
23+
---cluster0[1:s]
24+
INFO: =============================
25+
INFO: JOBID=1
26+
INFO: RESOURCES=ALLOCATED
27+
INFO: SCHEDULED AT=Now
28+
INFO: =============================
29+
---cluster0[1:x]
30+
INFO: =============================
31+
INFO: EXPRESSION="sched-now=free"
32+
INFO: =============================

‎t/data/resource/expected/update/016.R.out‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
INFO: =============================
2+
INFO: No matching resources found
3+
INFO: JOBID=1
4+
INFO: =============================
5+
---------core0[1:x]
6+
---------core1[1:x]
7+
---------core2[1:x]
8+
---------core3[1:x]
9+
---------core4[1:x]
10+
---------core5[1:x]
11+
---------core6[1:x]
12+
---------core7[1:x]
13+
---------core8[1:x]
14+
---------core9[1:x]
15+
---------core10[1:x]
16+
---------core11[1:x]
17+
---------core12[1:x]
18+
---------core13[1:x]
19+
---------core14[1:x]
20+
---------core15[1:x]
21+
---------gpu0[1:x]
22+
---------gpu1[1:x]
23+
---------gpu2[1:x]
24+
---------gpu3[1:x]
25+
------node0[1:x]
26+
---cluster0[1:s]
27+
INFO: =============================
28+
INFO: JOBID=2
29+
INFO: RESOURCES=ALLOCATED
30+
INFO: SCHEDULED AT=Now
31+
INFO: =============================
32+
---------core0[1:x]
33+
---------core1[1:x]
34+
---------core2[1:x]
35+
---------core3[1:x]
36+
---------core4[1:x]
37+
---------core5[1:x]
38+
---------core6[1:x]
39+
---------core7[1:x]
40+
---------core8[1:x]
41+
---------core9[1:x]
42+
---------core10[1:x]
43+
---------core11[1:x]
44+
---------core12[1:x]
45+
---------core13[1:x]
46+
---------core14[1:x]
47+
---------core15[1:x]
48+
---------gpu0[1:x]
49+
---------gpu1[1:x]
50+
---------gpu2[1:x]
51+
---------gpu3[1:x]
52+
------node1[1:x]
53+
---cluster0[1:s]
54+
INFO: =============================
55+
INFO: JOBID=3
56+
INFO: RESOURCES=ALLOCATED
57+
INFO: SCHEDULED AT=Now
58+
INFO: =============================
59+
---cluster0[1:x]
60+
INFO: =============================
61+
INFO: EXPRESSION="sched-now=free"
62+
INFO: =============================

‎t/data/resource/jobspecs/update/test007.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
version: 9999
2+
resources:
3+
- type: node
4+
count: 1
5+
with:
6+
- type: slot
7+
count: 1
8+
label: default
9+
with:
10+
- type: core
11+
count: 1
12+
# a comment
13+
attributes:
14+
system:
15+
duration: 3600
16+
tasks:
17+
- command: [ "app" ]
18+
slot: default
19+
count:
20+
per_slot: 1
21+

‎t/data/resource/jobspecs/update/test008.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 9999
2+
resources:
3+
- type: node
4+
count: 1
5+
with:
6+
- type: slot
7+
count: 1
8+
label: default
9+
with:
10+
- type: core
11+
count: 1
12+
- type: gpu
13+
count: 1
14+
# a comment
15+
attributes:
16+
system:
17+
duration: 3600
18+
tasks:
19+
- command: [ "app" ]
20+
slot: default
21+
count:
22+
per_slot: 1
23+

‎t/data/resource/jobspecs/update/test009.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version": 1, "execution": {"R_lite": [{"rank": "0", "children": {"core": "0-15", "gpu": "0-3"}}], "nodelist": ["node"], "starttime": 0, "expiration": 1000000}}

‎t/data/resource/jobspecs/update/test010.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version": 1, "execution": {"R_lite": [{"rank": "1", "children": {"core": "0-15", "gpu": "0-3"}}], "nodelist": ["node"], "starttime": 0, "expiration": 1000000}}

‎t/data/resource/jobspecs/update/test011.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version": 1, "execution": {"R_lite": [{"rank": "0", "children": {"core": "0-7", "gpu": "0-1"}}, {"rank": "1", "children": {"core": "8-15", "gpu": "2-3"}}], "nodelist": ["node", "node"], "starttime": 0, "expiration": 1000000}}

‎t/data/resource/jobspecs/update/test012.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version": 1, "execution": {"R_lite": [{"rank": "0", "children": {"core": "0-15", "gpu": "0-3", "asic": "0"}}], "nodelist": ["node0"], "starttime": 0, "expiration": 1000000}}

‎t/data/resource/jobspecs/update/test013.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version": 1, "execution": {"R_lite": [{"rank": "0", "children": {"core": "0-15", "gpu": "0-3"}}], "nodelist": ["node0"], "starttime": 0, "expiration": 1000000}}

0 commit comments

Comments
 (0)