From c765b569b126c461d831675c174b84949e9000c6 Mon Sep 17 00:00:00 2001 From: jessieyu Date: Fri, 7 Jan 2022 08:47:26 -0500 Subject: [PATCH 1/2] use unique program --- test/test_integration_job.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/test_integration_job.py b/test/test_integration_job.py index 4804f6ce9f..66ad49b63e 100644 --- a/test/test_integration_job.py +++ b/test/test_integration_job.py @@ -209,15 +209,19 @@ def test_retrieve_all_jobs(self, service): @run_cloud_legacy_real def test_retrieve_jobs_limit(self, service): """Test retrieving jobs with limit.""" + # Use a new program so we don't get jobs from another test. + program_id = self._upload_program(service) jobs = [] for _ in range(3): - jobs.append(self._run_program(service)) + jobs.append(self._run_program(service, program_id=program_id)) rjobs = service.jobs(limit=2) self.assertEqual(len(rjobs), 2) + job_ids = {job.job_id for job in jobs} rjob_ids = {rjob.job_id for rjob in rjobs} - self.assertTrue(rjob_ids.issubset(job_ids)) + self.assertTrue(rjob_ids.issubset(job_ids), + f"Submitted: {job_ids}, Retrieved: {rjob_ids}") @run_cloud_legacy_real def test_retrieve_pending_jobs(self, service): From 51f935a009940f279fde92fe73097bd9e02ca0e5 Mon Sep 17 00:00:00 2001 From: jessieyu Date: Fri, 7 Jan 2022 08:52:02 -0500 Subject: [PATCH 2/2] filter by program id --- test/test_integration_job.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/test_integration_job.py b/test/test_integration_job.py index 66ad49b63e..b4c7d92b23 100644 --- a/test/test_integration_job.py +++ b/test/test_integration_job.py @@ -209,19 +209,17 @@ def test_retrieve_all_jobs(self, service): @run_cloud_legacy_real def test_retrieve_jobs_limit(self, service): """Test retrieving jobs with limit.""" - # Use a new program so we don't get jobs from another test. - program_id = self._upload_program(service) jobs = [] for _ in range(3): - jobs.append(self._run_program(service, program_id=program_id)) + jobs.append(self._run_program(service)) - rjobs = service.jobs(limit=2) + rjobs = service.jobs(limit=2, program_id=self.program_ids[service.auth]) self.assertEqual(len(rjobs), 2) - job_ids = {job.job_id for job in jobs} rjob_ids = {rjob.job_id for rjob in rjobs} - self.assertTrue(rjob_ids.issubset(job_ids), - f"Submitted: {job_ids}, Retrieved: {rjob_ids}") + self.assertTrue( + rjob_ids.issubset(job_ids), f"Submitted: {job_ids}, Retrieved: {rjob_ids}" + ) @run_cloud_legacy_real def test_retrieve_pending_jobs(self, service):