Fix the test case

Author: Stephen DiAdamo

integration_tests/test_quantum_storage.py

@@ -157,9 +157,9 @@ def test_get_qubit_by_id(self):
         q3 = FakeQubit()
 
         storage = QuantumStorage()
-        storage.add_qubit_from_host('T', Constants.DATA, q1)
-        storage.add_qubit_from_host('T', Constants.EPR, q2)
-        storage.add_qubit_from_host('T', Constants.GHZ, q3)
+        storage.add_qubit_from_host(q1, from_host_id='S', purpose=Constants.DATA)
+        storage.add_qubit_from_host(q2, from_host_id='T', purpose=Constants.EPR)
+        storage.add_qubit_from_host(q3, from_host_id='V', purpose=Constants.GHZ)
 
         self.assertEqual(q1, storage.get_qubit_by_id(q1.id))
         self.assertEqual(q2, storage.get_qubit_by_id(q2.id))

qunetsim/objects/quantum_storage.py

@@ -163,9 +163,8 @@ def get_qubit_by_id(self, q_id):
         Returns:
             (Qubit): The qubit with the id *q_id* or None if it does not exist
         """
-        matching_qubits = [q for q_list in self._qubit_dict.values() for q in q_list if q.id == q_id]
-        if len(matching_qubits) > 0:
-            return matching_qubits[0]
+        if q_id in self._qubit_dict:
+            return list(self._qubit_dict[q_id].values())[0]
         return None
 
     def change_qubit_id(self, from_host_id, new_id, old_id=None):
@@ -256,10 +255,10 @@ def get_all_qubits_from_host(self, from_host_id, purpose=None):
 
     def _check_all_requests(self):
         """
-        Checks if any of the pending requests is now fullfilled.
+        Checks if any of the pending requests is now fulfilled.
 
         Returns:
-            If a request is fullfilled, the request is handeled and the function
+            If a request is fulfilled, the request is handled and the function
             returns the qubit of this request.
         """
         for req_id, args in self._pending_request_dict.items():
@@ -365,7 +364,9 @@ def _get_qubit_from_host(self, from_host_id, q_id, purpose):
         return None
 
     def _pop_qubit_with_id_and_host_from_qubit_dict(self, q_id, from_host_id, purpose=None):
-        def _pop_purpose_from_purpose_dict(q_id, from_host_id):
+        def _pop_purpose_from_purpose_dict():
+            nonlocal q_id, from_host_id
+
             if q_id not in self._purpose_dict:
                 return None
             pur = self._purpose_dict[q_id].pop(from_host_id, None)
@@ -375,7 +376,7 @@ def _pop_purpose_from_purpose_dict(q_id, from_host_id):
                 return pur
             return None
 
-        purp = _pop_purpose_from_purpose_dict(q_id, from_host_id)
+        purp = _pop_purpose_from_purpose_dict()
         if purp is not None:
             if purpose is None or purpose == purp:
                 qubit = self._qubit_dict[q_id].pop(from_host_id, None)
@@ -390,15 +391,16 @@ def _pop_purpose_from_purpose_dict(q_id, from_host_id):
         return None
 
     def _add_qubit_to_qubit_dict(self, qubit, purpose, from_host_id):
-        def _add_purpose_to_purpose_dict(purpose, id, from_host_id):
-            if id not in self._purpose_dict:
-                self._purpose_dict[id] = {}
-            self._purpose_dict[id][from_host_id] = purpose
+        def _add_purpose_to_purpose_dict(q_id):
+            nonlocal purpose, from_host_id
+            if q_id not in self._purpose_dict:
+                self._purpose_dict[q_id] = {}
+            self._purpose_dict[q_id][from_host_id] = purpose
 
         if qubit.id not in self._qubit_dict:
             self._qubit_dict[qubit.id] = {}
         self._qubit_dict[qubit.id][from_host_id] = qubit
-        _add_purpose_to_purpose_dict(purpose, qubit.id, from_host_id)
+        _add_purpose_to_purpose_dict(qubit.id)
 
     def _add_new_host(self, host_id):
         if host_id not in self._host_dict:
@@ -410,6 +412,14 @@ def _add_new_host(self, host_id):
     def _check_qubit_in_system(self, qubit, from_host_id, purpose=None):
         """
         True if qubit with same parameters already in the systems
+
+        Args:
+            qubit (Qubit): The qubit in question
+            from_host_id (str): The ID of the sending host
+            purpose (int): Qubit's purpose
+
+        Returns:
+            (bool): If the qubit is in the system.
         """
         if qubit.id in self._qubit_dict and \
                 from_host_id in self._qubit_dict[qubit.id]: