Skip to content

Commit 922b6dc

Browse files
zekemortonzekemorton
committed
tests: add tests for rq2
Problem: rq2 needs tests to verify that it can be a drop in replacement for rq1 Add some simple tests for current functionality. Generate the expected files using rq1
1 parent 6c7ca2e commit 922b6dc

File tree

6 files changed

+144
-0
lines changed

6 files changed

+144
-0
lines changed

‎t/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ set(ALL_TESTS
6363
t3033-resource-nodex.t
6464
t3034-resource-pconstraints.t
6565
t3035-resource-remove.t
66+
t3036-rq2.t
6667
t3300-system-dontblock.t
6768
t3301-system-latestart.t
6869
t4000-match-params.t

‎t/data/resource/commands/rq2/cmds01.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
match allocate @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
2+
match allocate @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
3+
match allocate @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
4+
match allocate @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
5+
match allocate @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
6+
quit

‎t/data/resource/commands/rq2/cmds02.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
2+
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
3+
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
4+
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
5+
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
6+
match allocate @TEST_SRCDIR@/data/resource/jobspecs/basics/test001.yaml
7+
quit

‎t/data/resource/expected/rq2/001.R.out‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---------------core35[1:x]
2+
------------socket1[1:x]
3+
---------node1[1:s]
4+
------rack0[1:s]
5+
---tiny0[1:s]
6+
INFO: =============================
7+
INFO: JOBID=1
8+
INFO: RESOURCES=ALLOCATED
9+
INFO: SCHEDULED AT=Now
10+
INFO: =============================
11+
---------------core35[1:x]
12+
------------socket1[1:x]
13+
---------node0[1:s]
14+
------rack0[1:s]
15+
---tiny0[1:s]
16+
INFO: =============================
17+
INFO: JOBID=2
18+
INFO: RESOURCES=ALLOCATED
19+
INFO: SCHEDULED AT=Now
20+
INFO: =============================
21+
---------------core17[1:x]
22+
------------socket0[1:x]
23+
---------node1[1:s]
24+
------rack0[1:s]
25+
---tiny0[1:s]
26+
INFO: =============================
27+
INFO: JOBID=3
28+
INFO: RESOURCES=ALLOCATED
29+
INFO: SCHEDULED AT=Now
30+
INFO: =============================
31+
---------------core17[1:x]
32+
------------socket0[1:x]
33+
---------node0[1:s]
34+
------rack0[1:s]
35+
---tiny0[1:s]
36+
INFO: =============================
37+
INFO: JOBID=4
38+
INFO: RESOURCES=ALLOCATED
39+
INFO: SCHEDULED AT=Now
40+
INFO: =============================
41+
INFO: =============================
42+
INFO: No matching resources found
43+
INFO: JOBID=5
44+
INFO: =============================

‎t/data/resource/expected/rq2/002.R.out‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---------------core35[1:x]
2+
------------socket1[1:x]
3+
---------node1[1:s]
4+
------rack0[1:s]
5+
---tiny0[1:s]
6+
INFO: =============================
7+
INFO: JOBID=1
8+
INFO: RESOURCES=ALLOCATED
9+
INFO: SCHEDULED AT=Now
10+
INFO: =============================
11+
---------------core35[1:x]
12+
------------socket1[1:x]
13+
---------node0[1:s]
14+
------rack0[1:s]
15+
---tiny0[1:s]
16+
INFO: =============================
17+
INFO: JOBID=2
18+
INFO: RESOURCES=ALLOCATED
19+
INFO: SCHEDULED AT=Now
20+
INFO: =============================
21+
---------------core17[1:x]
22+
------------socket0[1:x]
23+
---------node1[1:s]
24+
------rack0[1:s]
25+
---tiny0[1:s]
26+
INFO: =============================
27+
INFO: JOBID=3
28+
INFO: RESOURCES=ALLOCATED
29+
INFO: SCHEDULED AT=Now
30+
INFO: =============================
31+
---------------core17[1:x]
32+
------------socket0[1:x]
33+
---------node0[1:s]
34+
------rack0[1:s]
35+
---tiny0[1:s]
36+
INFO: =============================
37+
INFO: JOBID=4
38+
INFO: RESOURCES=ALLOCATED
39+
INFO: SCHEDULED AT=Now
40+
INFO: =============================
41+
---------------core35[1:x]
42+
------------socket1[1:x]
43+
---------node1[1:s]
44+
------rack0[1:s]
45+
---tiny0[1:s]
46+
INFO: =============================
47+
INFO: JOBID=5
48+
INFO: RESOURCES=RESERVED
49+
INFO: SCHEDULED AT=3600
50+
INFO: =============================
51+
INFO: =============================
52+
INFO: No matching resources found
53+
INFO: JOBID=6
54+
INFO: =============================

‎t/t3036-rq2.t‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/sh
2+
3+
test_description='Test resource graph remove subgraph'
4+
5+
. $(dirname $0)/sharness.sh
6+
7+
cmd_dir="${SHARNESS_TEST_SRCDIR}/data/resource/commands/rq2"
8+
exp_dir="${SHARNESS_TEST_SRCDIR}/data/resource/expected/rq2"
9+
jgf="${SHARNESS_TEST_SRCDIR}/data/resource/jgfs/tiny.json"
10+
query="../../resource/utilities/rq2"
11+
12+
cmds001="${cmd_dir}/cmds01.in"
13+
test001_desc="match allocate test"
14+
test_expect_success "${test001_desc}" '
15+
sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds001} > cmds001 &&
16+
${query} -L ${jgf} -f jgf -t 001.R.out \
17+
< cmds001 &&
18+
test_cmp 001.R.out ${exp_dir}/001.R.out
19+
'
20+
21+
cmds002="${cmd_dir}/cmds02.in"
22+
test002_desc="match allocate_orelse_reserve test"
23+
test_expect_success "${test002_desc}" '
24+
sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmds002} > cmds002 &&
25+
${query} -L ${jgf} -f jgf -t 002.R.out \
26+
< cmds002 &&
27+
test_cmp 002.R.out ${exp_dir}/002.R.out
28+
'
29+
30+
31+
32+
test_done

0 commit comments

Comments
 (0)