Skip to content

Commit e0d221a

Browse files
committed
Also check for expected output in k8s delete test
1 parent ada9ee6 commit e0d221a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

test/integration/test_kubernetes_runner.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def test_kill_process(self):
245245

246246
app = self._app
247247
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"]))
249249

250250
self._wait_for_external_state(sa_session, job, app.model.Job.states.RUNNING)
251251
assert not job.finished
@@ -279,10 +279,11 @@ def test_external_job_delete(self):
279279
history_id,
280280
assert_ok=False,
281281
)
282+
job_dict = running_response.json()["jobs"][0]
282283

283284
app = self._app
284285
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"]))
286287

287288
self._wait_for_external_state(sa_session, job, app.model.Job.states.RUNNING)
288289

@@ -294,9 +295,11 @@ def test_external_job_delete(self):
294295
output = unicodify(subprocess.check_output(['kubectl', 'delete', 'job', external_id, '-o', 'name']))
295296
assert 'job.batch/%s' % external_id in output
296297

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()
298301

299-
assert job.state == app.model.Job.states.ERROR
302+
assert details['state'] == app.model.Job.states.ERROR, details
300303

301304
@skip_without_tool('job_properties')
302305
def test_exit_code_127(self):

0 commit comments

Comments
 (0)