Skip to content

Commit e25bef6

Browse files
milroymilroy
committed
testsuite: update commands, expected, jobspecs for t3035
1 parent 5805922 commit e25bef6

File tree

15 files changed

+118
-53
lines changed

15 files changed

+118
-53
lines changed

‎t/data/resource/commands/remove/cmds07.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ find agfilter=t
22
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
33
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
44
remove /tiny0/rack0/node1 true
5-
find jobid-alloc=2 agfilter=t
6-
find jobid-alloc=1 agfilter=t
5+
find jobid-span=2 agfilter=t
6+
find jobid-span=1 agfilter=t
77
find agfilter=t
88
cancel 1
99
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml

‎t/data/resource/commands/remove/cmds08.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ find agfilter=t
22
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
33
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
44
remove [1] false
5-
find jobid-alloc=2 agfilter=t
6-
find jobid-alloc=1 agfilter=t
5+
find jobid-span=2 agfilter=t
6+
find jobid-span=1 agfilter=t
77
find agfilter=t
88
cancel 1
99
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml

‎t/data/resource/commands/remove/cmds09.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
find agfilter=t
22
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test002.yaml
33
remove [0] false
4-
find jobid-alloc=1 agfilter=t
4+
find jobid-span=1 agfilter=t
55
find agfilter=t
66
cancel 1
77
find agfilter=t
88
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
9-
find jobid-alloc=2 agfilter=t
9+
find jobid-span=2 agfilter=t
1010
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
1111
find agfilter=t
1212
quit

‎t/data/resource/commands/remove/cmds10.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
find agfilter=t
22
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test002.yaml
33
remove [0] false
4-
find jobid-alloc=1 agfilter=t
4+
find jobid-span=1 agfilter=t
55
find agfilter=t
66
cancel 1
77
find agfilter=t
88
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
9-
find jobid-alloc=2 agfilter=t
9+
find jobid-span=2 agfilter=t
1010
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
1111
find agfilter=t
1212
quit

‎t/data/resource/commands/remove/cmds11.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ find agfilter=t
22
remove [0] false
33
find agfilter=t
44
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
5-
find jobid-alloc=1 agfilter=t
5+
find jobid-span=1 agfilter=t
66
match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
77
find agfilter=t
88
quit

‎t/data/resource/expected/remove/004.R.out‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ INFO: =============================
119119
---------------core15[1:x]
120120
---------------core16[1:x]
121121
---------------core17[1:x]
122+
---------------gpu0[1:x]
123+
---------------memory0[2:x]
124+
---------------memory1[2:x]
125+
---------------memory2[2:x]
126+
---------------memory3[2:x]
122127
------------socket0[1:x]
123128
---------------core18[1:x]
124129
---------------core19[1:x]
@@ -138,6 +143,11 @@ INFO: =============================
138143
---------------core33[1:x]
139144
---------------core34[1:x]
140145
---------------core35[1:x]
146+
---------------gpu1[1:x]
147+
---------------memory4[2:x]
148+
---------------memory5[2:x]
149+
---------------memory6[2:x]
150+
---------------memory7[2:x]
141151
------------socket1[1:x]
142152
---------node1[1:x]
143153
------rack0[1:s]

‎t/data/resource/expected/remove/005.R.out‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ INFO: =============================
119119
---------------core15[1:x]
120120
---------------core16[1:x]
121121
---------------core17[1:x]
122+
---------------gpu0[1:x]
123+
---------------memory0[2:x]
124+
---------------memory1[2:x]
125+
---------------memory2[2:x]
126+
---------------memory3[2:x]
122127
------------socket0[1:x]
123128
---------------core18[1:x]
124129
---------------core19[1:x]
@@ -138,6 +143,11 @@ INFO: =============================
138143
---------------core33[1:x]
139144
---------------core34[1:x]
140145
---------------core35[1:x]
146+
---------------gpu1[1:x]
147+
---------------memory4[2:x]
148+
---------------memory5[2:x]
149+
---------------memory6[2:x]
150+
---------------memory7[2:x]
141151
------------socket1[1:x]
142152
---------node0[1:x]
143153
------rack0[1:s]

‎t/data/resource/expected/remove/006.R.out‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
11
---------------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+
---------------core16[1:x]
18+
---------------core17[1:x]
19+
---------------gpu0[1:x]
20+
---------------memory0[2:x]
21+
---------------memory1[2:x]
22+
---------------memory2[2:x]
23+
---------------memory3[2:x]
224
------------socket0[1:x]
325
---------node0[1:s]
426
------rack0[1:s]
@@ -9,6 +31,28 @@ INFO: RESOURCES=ALLOCATED
931
INFO: SCHEDULED AT=Now
1032
INFO: =============================
1133
---------------core18[1:x]
34+
---------------core19[1:x]
35+
---------------core20[1:x]
36+
---------------core21[1:x]
37+
---------------core22[1:x]
38+
---------------core23[1:x]
39+
---------------core24[1:x]
40+
---------------core25[1:x]
41+
---------------core26[1:x]
42+
---------------core27[1:x]
43+
---------------core28[1:x]
44+
---------------core29[1:x]
45+
---------------core30[1:x]
46+
---------------core31[1:x]
47+
---------------core32[1:x]
48+
---------------core33[1:x]
49+
---------------core34[1:x]
50+
---------------core35[1:x]
51+
---------------gpu1[1:x]
52+
---------------memory4[2:x]
53+
---------------memory5[2:x]
54+
---------------memory6[2:x]
55+
---------------memory7[2:x]
1256
------------socket1[1:x]
1357
---------node0[1:s]
1458
------rack0[1:s]

‎t/data/resource/expected/remove/007.R.out‎

Lines changed: 9 additions & 8 deletions
Large diffs are not rendered by default.

‎t/data/resource/expected/remove/008.R.out‎

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)