@@ -245,7 +245,7 @@ def test_kill_process(self):
245
245
246
246
app = self ._app
247
247
sa_session = app .model .context .current
248
- job = sa_session .query (app .model .Job ).filter_by ( tool_id = "cat_data_and_sleep" ). one ( )
248
+ job = sa_session .query (app .model .Job ).get ( app . security . decode_id ( job_dict [ "id" ]) )
249
249
250
250
self ._wait_for_external_state (sa_session , job , app .model .Job .states .RUNNING )
251
251
assert not job .finished
@@ -279,10 +279,11 @@ def test_external_job_delete(self):
279
279
history_id ,
280
280
assert_ok = False ,
281
281
)
282
+ job_dict = running_response .json ()["jobs" ][0 ]
282
283
283
284
app = self ._app
284
285
sa_session = app .model .context .current
285
- job = sa_session .query (app .model .Job ).filter_by ( tool_id = "cat_data_and_sleep" ). one ( )
286
+ job = sa_session .query (app .model .Job ).get ( app . security . decode_id ( job_dict [ "id" ]) )
286
287
287
288
self ._wait_for_external_state (sa_session , job , app .model .Job .states .RUNNING )
288
289
@@ -294,9 +295,11 @@ def test_external_job_delete(self):
294
295
output = unicodify (subprocess .check_output (['kubectl' , 'delete' , 'job' , external_id , '-o' , 'name' ]))
295
296
assert 'job.batch/%s' % external_id in output
296
297
297
- self ._wait_for_external_state (sa_session , job , app .model .Job .states .ERROR )
298
+ result = self .dataset_populator .wait_for_tool_run (run_response = running_response , history_id = history_id ,
299
+ assert_ok = False ).json ()
300
+ details = self .dataset_populator .get_job_details (result ['jobs' ][0 ]['id' ], full = True ).json ()
298
301
299
- assert job . state == app .model .Job .states .ERROR
302
+ assert details [ ' state' ] == app .model .Job .states .ERROR , details
300
303
301
304
@skip_without_tool ('job_properties' )
302
305
def test_exit_code_127 (self ):
0 commit comments