Merge branch 'main' into backendv2

test/decorators.py

@@ -48,6 +48,7 @@ def _get_integration_test_config():
 def integration_test_setup_with_backend(
     backend_name: Optional[str] = None,
     simulator: Optional[bool] = True,
+    min_num_qubits: Optional[int] = None,
 ) -> Callable:
     """Returns a decorator that retrieves the appropriate backend to use for testing.
 
@@ -57,6 +58,7 @@ def integration_test_setup_with_backend(
     Args:
         backend_name: The name of the backend.
         simulator: If set to True, the list of suitable backends is limited to simulators.
+        min_num_qubits: Minimum number of qubits the backend has to have.
 
     Returns:
         Decorator that retrieves the appropriate backend to use for testing.
@@ -75,7 +77,9 @@ def _wrapper(self, *args, **kwargs):
             else:
                 _backend = least_busy(
                     provider.backends(
-                        simulator=simulator, instance=dependencies.instance
+                        simulator=simulator,
+                        instance=dependencies.instance,
+                        min_num_qubits=min_num_qubits,
                     )
                 )
             if not _backend:

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:

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")

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:

test/integration/test_ibm_integration.py

@@ -34,7 +34,7 @@ class TestIBMIntegration(IBMTestCase):
     seed = 42
 
     @classmethod
-    @integration_test_setup_with_backend(simulator=False)
+    @integration_test_setup_with_backend(simulator=False, min_num_qubits=2)
     def setUpClass(
         cls, backend: IBMBackend, dependencies: IntegrationTestDependencies
     ) -> None:

test/integration/test_ibm_job.py

@@ -53,7 +53,7 @@ class TestIBMJob(IBMTestCase):
     """Test ibm_job module."""
 
     @classmethod
-    @integration_test_setup_with_backend(simulator=False)
+    @integration_test_setup_with_backend(simulator=False, min_num_qubits=2)
     def setUpClass(
         cls, backend: IBMBackend, dependencies: IntegrationTestDependencies
     ) -> None:

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: