Fix: updates tests

Author: erichulburd

.github/workflows/test.yml

@@ -106,4 +106,4 @@ jobs:
         # This is an exact match list, new dependencies will likely require their own entries
         run: |
           . scripts/ci_install_deps
-          # poetry run pip-licenses --allow-only="MIT License;Apache Software License;BSD License;GNU Lesser General Public License v2 or later (LGPLv2+);Python Software Foundation License;Apache License 2.0;new BSD;Apache-2.0;ISCL;ISC License (ISCL);BSD;Mozilla Public License 2.0 (MPL 2.0)"
+          poetry run pip-licenses --allow-only="MIT License;Apache Software License;BSD License;GNU Lesser General Public License v2 or later (LGPLv2+);Python Software Foundation License;Apache License 2.0;new BSD;Apache-2.0;ISCL;ISC License (ISCL);BSD;Mozilla Public License 2.0 (MPL 2.0)"

qiskit_rigetti/_qcs_backend.py

@@ -84,10 +84,7 @@ def _prepare_circuit(circuit: QuantumCircuit) -> QuantumCircuit:
     """
     Returns a prepared copy of the circuit for execution on the QCS Backend.
     """
-    if hasattr(circuit, "copy"):
-        circuit = circuit.copy()
-    else:
-        circuit = copy.deepcopy(circuit)
+    circuit = circuit.copy()
     _prepare_readouts(circuit)
     return circuit
 

qiskit_rigetti/_qcs_job.py

@@ -107,9 +107,7 @@ def _start_circuit(self, circuit: QuantumCircuit) -> Response:
         executable = self._qc.compiler.native_quil_to_executable(program)
 
         # typing: QuantumComputer's inner QAM is generic, so we set the expected type here
-        result = cast(Response, self._qc.qam.execute(executable))
-        # store the remote job id here
-        return result
+        return cast(Response, self._qc.qam.execute(executable))
 
     @staticmethod
     def _handle_barriers(qasm: str, num_circuit_qubits: int) -> str:

tests/test_qcs_backend.py

@@ -85,19 +85,15 @@ def test_run__parametric_circuits(backend: RigettiQCSBackend):
     assert result.backend_name == backend.configuration().backend_name
     assert len(result.results) == 4
 
-    # assert result.results[0].header.name.startswith(f"{circuit1.name}-")
     assert result.results[0].shots == 1000
     assert result.get_counts(0).keys() == {"0", "1"}
 
-    # assert result.results[1].header.name.startswith(f"{circuit1.name}-")
     assert result.results[1].shots == 1000
     assert result.get_counts(1).keys() == {"0", "1"}
 
-    # assert result.results[2].header.name.startswith(f"{circuit2.name}-")
     assert result.results[2].shots == 1000
     assert result.get_counts(2).keys() == {"0", "1"}
 
-    # assert result.results[3].header.name.startswith(f"{circuit2.name}-")
     assert result.results[3].shots == 1000
     assert result.get_counts(3).keys() == {"0", "1"}
 

tests/test_qcs_provider.py

@@ -25,8 +25,11 @@ def test_get_simulator(monkeypatch):
 
     assert backend.name() == "42q-qvm"
     assert backend.configuration().num_qubits == 42
+    # The default QVM url is 127.0.0.1, but Gitlab CI may use a docker service url.
+    # Below we assert that the local value on the configuration is True/False depending
+    # on the `QCS_SETTINGS_APPLICATIONS_PYQUIL_QVM_URL` set during the test run.
     assert (
-        "qvm:" not in os.getenv("QCS_SETTINGS_APPLICATIONS_PYQUIL_QVM_URL", "127.0.0.1")
+        "http://qvm:5000" != os.getenv("QCS_SETTINGS_APPLICATIONS_PYQUIL_QVM_URL", "http://127.0.0.1:5000")
     ) == backend.configuration().local
     assert backend.configuration().simulator
     assert backend.configuration().coupling_map