Merge e8e2347 into 2695450

Qiskit · Apr 7, 2022 · 7b7df9d · 7b7df9d
2 parents 2695450 + e8e2347
commit 7b7df9d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/test/integration/test_account_client.py b/test/integration/test_account_client.py
@@ -157,7 +157,7 @@ class TestAccountClientJobs(IBMTestCase):
     """
 
     @classmethod
-    @integration_test_setup_with_backend(backend_name="ibmq_qasm_simulator")
+    @integration_test_setup_with_backend()
     def setUpClass(
         cls, dependencies: IntegrationTestDependencies, backend: IBMBackend
     ) -> None:

diff --git a/test/integration/test_backend.py b/test/integration/test_backend.py
@@ -154,9 +154,7 @@ def test_backend_options(self):
     def test_sim_backend_options(self):
         """Test simulator backend options."""
         provider: IBMProvider = self.backend.provider()
-        backend = provider.get_backend(
-            "ibmq_qasm_simulator", instance=self.dependencies.instance
-        )
+        backend = provider.get_backend("ibmq_qasm_simulator")
         backend.options.shots = 2048
         backend.set_options(memory=True)
         job = backend.run(ReferenceCircuits.bell(), shots=1024, foo="foo")

diff --git a/test/integration/test_filter_backends.py b/test/integration/test_filter_backends.py
@@ -31,7 +31,7 @@ class TestBackendFilters(IBMTestCase):
     """Qiskit Backend Filtering Tests."""
 
     @classmethod
-    @integration_test_setup_with_backend(backend_name="ibmq_qasm_simulator")
+    @integration_test_setup_with_backend()
     def setUpClass(
         cls, backend: IBMBackend, dependencies: IntegrationTestDependencies
     ) -> None:

diff --git a/test/integration/test_ibm_integration.py b/test/integration/test_ibm_integration.py
@@ -74,8 +74,8 @@ def test_compile_remote(self):
         quantum_circuit.h(qubit_reg[0])
         quantum_circuit.cx(qubit_reg[0], qubit_reg[1])
         quantum_circuit.measure(qubit_reg, clbit_reg)
-
-        circuits = transpile(quantum_circuit, backend=self.real_device_backend)
+        backend = self.dependencies.provider.get_backend("ibmq_lima")
+        circuits = transpile(quantum_circuit, backend=backend)
         self.assertIsInstance(circuits, QuantumCircuit)
 
     def test_compile_two_remote(self):
@@ -88,7 +88,8 @@ def test_compile_two_remote(self):
         quantum_circuit.measure(qubit_reg, clbit_reg)
         qc_extra = QuantumCircuit(qubit_reg, clbit_reg, name="extra")
         qc_extra.measure(qubit_reg, clbit_reg)
-        circuits = transpile([quantum_circuit, qc_extra], self.real_device_backend)
+        backend = self.dependencies.provider.get_backend("ibmq_lima")
+        circuits = transpile([quantum_circuit, qc_extra], backend)
         self.assertIsInstance(circuits[0], QuantumCircuit)
         self.assertIsInstance(circuits[1], QuantumCircuit)
 

diff --git a/test/integration/test_ibm_job.py b/test/integration/test_ibm_job.py
@@ -220,7 +220,7 @@ def test_retrieve_job(self):
 
     def test_retrieve_job_uses_appropriate_backend(self):
         """Test that retrieved jobs come from their appropriate backend."""
-        backend_1 = self.real_device_backend
+        backend_1 = self.dependencies.provider.get_backend("ibmq_lima")
         # Get a second backend.
         backend_2 = None
         provider = self.real_device_backend.provider()

diff --git a/test/integration/test_ibm_job_attributes.py b/test/integration/test_ibm_job_attributes.py
@@ -49,7 +49,7 @@ class TestIBMJobAttributes(IBMTestCase):
     """Test IBMJob instance attributes."""
 
     @classmethod
-    @integration_test_setup_with_backend(backend_name="ibmq_qasm_simulator")
+    @integration_test_setup_with_backend()
     def setUpClass(
         cls, backend: IBMBackend, dependencies: IntegrationTestDependencies
     ) -> None: