@@ -27,11 +27,15 @@ module('Acceptance | exec', function (hooks) {
27
27
} ) ;
28
28
29
29
this . job . taskGroups . models . forEach ( ( taskGroup ) => {
30
- server . create ( 'allocation' , {
30
+ const alloc = server . create ( 'allocation' , {
31
31
jobId : this . job . id ,
32
32
taskGroup : taskGroup . name ,
33
33
forceRunningClientStatus : true ,
34
34
} ) ;
35
+ server . db . taskStates . update (
36
+ { allocationId : alloc . id } ,
37
+ { state : 'running' }
38
+ ) ;
35
39
} ) ;
36
40
} ) ;
37
41
@@ -135,12 +139,11 @@ module('Acceptance | exec', function (hooks) {
135
139
136
140
let runningTaskGroup = this . job . taskGroups . models . sortBy ( 'name' ) [ 1 ] ;
137
141
runningTaskGroup . tasks . models . forEach ( ( task , index ) => {
142
+ let state = 'running' ;
138
143
if ( index > 0 ) {
139
- this . server . db . taskStates . update (
140
- { name : task . name } ,
141
- { finishedAt : new Date ( ) }
142
- ) ;
144
+ state = 'dead' ;
143
145
}
146
+ this . server . db . taskStates . update ( { name : task . name } , { state } ) ;
144
147
} ) ;
145
148
146
149
await Exec . visitJob ( { job : this . job . id } ) ;
@@ -159,12 +162,11 @@ module('Acceptance | exec', function (hooks) {
159
162
let runningTaskGroup = this . job . taskGroups . models . sortBy ( 'name' ) [ 1 ] ;
160
163
let changingTaskStateName ;
161
164
runningTaskGroup . tasks . models . sortBy ( 'name' ) . forEach ( ( task , index ) => {
165
+ let state = 'running' ;
162
166
if ( index > 0 ) {
163
- this . server . db . taskStates . update (
164
- { name : task . name } ,
165
- { finishedAt : new Date ( ) }
166
- ) ;
167
+ state = 'dead' ;
167
168
}
169
+ this . server . db . taskStates . update ( { name : task . name } , { state } ) ;
168
170
169
171
if ( index === 1 ) {
170
172
changingTaskStateName = task . name ;
@@ -187,7 +189,7 @@ module('Acceptance | exec', function (hooks) {
187
189
) ;
188
190
189
191
if ( changingTaskState ) {
190
- changingTaskState . set ( 'finishedAt ' , undefined ) ;
192
+ changingTaskState . set ( 'state ' , 'running' ) ;
191
193
}
192
194
} ) ;
193
195
0 commit comments