From c9df2ebd381eb27a7a7da6260433bcfb9be3acdc Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 3 Jan 2024 09:44:47 +0200 Subject: [PATCH] Fix remaining API tests --- lib/galaxy/schema/schema.py | 14 +++++++++++--- lib/galaxy_test/api/test_jobs.py | 5 +++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py index 2772e43b3ac..f0c0250d608 100644 --- a/lib/galaxy/schema/schema.py +++ b/lib/galaxy/schema/schema.py @@ -1874,9 +1874,17 @@ class JobSummary(JobBaseModel): external_id: Optional[str] = Field( None, title="External ID", - description=( - "The job id used by the external job runner (Condor, Pulsar, etc.)" "Only administrator can see this value." - ), + description="The job id used by the external job runner (Condor, Pulsar, etc.). Only administrator can see this value.", + ) + handler: Optional[str] = Field( + None, + title="Job Handler", + description="The job handler process assigned to handle this job. Only administrator can see this value.", + ) + job_runner_name: Optional[str] = Field( + None, + title="Job Runner Name", + description="Name of the job runner plugin that handles this job. Only administrator can see this value.", ) command_line: Optional[str] = Field( None, diff --git a/lib/galaxy_test/api/test_jobs.py b/lib/galaxy_test/api/test_jobs.py index ccb15852ffd..5b295742a11 100644 --- a/lib/galaxy_test/api/test_jobs.py +++ b/lib/galaxy_test/api/test_jobs.py @@ -44,11 +44,12 @@ class TestJobsApi(ApiTestCase, TestsTools): self.__history_with_new_dataset(history_id) jobs = self.__jobs_index(admin=False) job = jobs[0] - self._assert_not_has_keys(job, "external_id") + assert job["external_id"] is None jobs = self.__jobs_index(admin=True) job = jobs[0] - self._assert_has_keys(job, "command_line", "external_id") + assert job["command_line"] + assert job["external_id"] @pytest.mark.require_new_history def test_admin_job_list(self, history_id):