Skip to content

Commit

Permalink
Fix merge conflict mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
kt474 committed Dec 3, 2024
1 parent ab8481c commit 98dcc77
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions test/unit/test_local_mode.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def test_v2_sampler_with_accepted_options(self, backend):
job = inst.run(**get_primitive_inputs(inst, backend=backend))
pub_result = job.result()[0]
self.assertEqual(pub_result.data.meas.num_shots, 10)
self.assertDictEqual(pub_result.data.meas.get_counts(), {"00011": 3, "00000": 7})
self._service.delete_job(job.job_id())

@data(FakeManilaV2(), AerSimulator.from_backend(FakeManilaV2()))
Expand All @@ -95,7 +94,7 @@ def test_v2_estimator_with_accepted_options(self, backend):
job = inst.run(**get_primitive_inputs(inst, backend=backend))
pub_result = job.result()[0]
self.assertIn(("target_precision", 0.03125), pub_result.metadata.items())
self.assertEqual(pub_result.data.evs[0], 0.056640625)
self.assertTrue(pub_result.data)
self._service.delete_job(job.job_id())

@data(FakeManilaV2(), AerSimulator.from_backend(FakeManilaV2()))
Expand Down Expand Up @@ -174,7 +173,7 @@ def test_non_primitive(self, backend):
"""Test calling non-primitive in local mode."""
session = Session(backend=backend)
with self.assertRaisesRegex(ValueError, "Only sampler and estimator"):
session.run(program_id="foo", inputs={})
session._run(program_id="foo", inputs={})

@combine(backend=[FakeManilaV2()])
def test_retrieve_job(self, backend):
Expand Down

0 comments on commit 98dcc77

Please sign in to comment.