Merge branch 'main' into more-layers

SamFerracin · Sep 23, 2024 · ad58449 · ad58449
2 parents 291160c + 4e15a91
commit ad58449
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/test/integration/test_job.py b/test/integration/test_job.py
@@ -144,7 +144,7 @@ def test_job_backend(self, service):
     def test_job_program_id(self, service):
         """Test job program ID."""
         job = self._run_program(service)
-        self.assertEqual(self.program_ids[service.channel], job.program_id)
+        self.assertEqual(self.program_ids[service.channel], job.primitive_id)
 
     @run_integration_test
     def test_wait_for_final_state(self, service):

diff --git a/test/integration/test_retrieve_job.py b/test/integration/test_retrieve_job.py
@@ -38,7 +38,7 @@ def test_retrieve_job_queued(self, service):
         wait_for_status(job, JobStatus.QUEUED)
         rjob = service.job(job.job_id())
         self.assertEqual(job.job_id(), rjob.job_id())
-        self.assertEqual(self.program_ids[service.channel], rjob.program_id)
+        self.assertEqual(self.program_ids[service.channel], rjob.primitive_id)
 
     @run_integration_test
     def test_retrieve_job_running(self, service):
@@ -47,7 +47,7 @@ def test_retrieve_job_running(self, service):
         wait_for_status(job, JobStatus.RUNNING)
         rjob = service.job(job.job_id())
         self.assertEqual(job.job_id(), rjob.job_id())
-        self.assertEqual(self.program_ids[service.channel], rjob.program_id)
+        self.assertEqual(self.program_ids[service.channel], rjob.primitive_id)
 
     @run_integration_test
     def test_retrieve_job_done(self, service):
@@ -56,7 +56,7 @@ def test_retrieve_job_done(self, service):
         job.wait_for_final_state()
         rjob = service.job(job.job_id())
         self.assertEqual(job.job_id(), rjob.job_id())
-        self.assertEqual(self.program_ids[service.channel], rjob.program_id)
+        self.assertEqual(self.program_ids[service.channel], rjob.primitive_id)
 
     @run_integration_test
     def test_retrieve_all_jobs(self, service):
@@ -66,7 +66,7 @@ def test_retrieve_all_jobs(self, service):
         found = False
         for rjob in rjobs:
             if rjob.job_id() == job.job_id():
-                self.assertEqual(job.program_id, rjob.program_id)
+                self.assertEqual(job.primitive_id, rjob.primitive_id)
                 self.assertEqual(job.status(), rjob.status())
                 found = True
                 break
@@ -95,7 +95,7 @@ def test_retrieve_pending_jobs(self, service):
         found = False
         for rjob in rjobs:
             if rjob.job_id() == job.job_id():
-                self.assertEqual(job.program_id, rjob.program_id)
+                self.assertEqual(job.primitive_id, rjob.primitive_id)
                 self.assertEqual(job.inputs, rjob.inputs)
                 found = True
                 break
@@ -114,7 +114,7 @@ def test_retrieve_returned_jobs(self, service):
         found = False
         for rjob in rjobs:
             if rjob.job_id() == job.job_id():
-                self.assertEqual(job.program_id, rjob.program_id)
+                self.assertEqual(job.primitive_id, rjob.primitive_id)
                 self.assertEqual(job.status(), rjob.status())
                 found = True
                 break
@@ -126,7 +126,7 @@ def test_retrieve_jobs_by_program_id(self, service):
         program_id = "sampler"
         jobs = service.jobs(program_id=program_id)
         for job in jobs:
-            self.assertEqual(program_id, job.program_id)
+            self.assertEqual(program_id, job.primitive_id)
 
     @run_integration_test
     def test_retrieve_jobs_by_job_tags(self, service):