tests/multi_bluetooth: Change dict index-and-del to pop, to clear event.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

tests/multi_bluetooth/ble_characteristic.py

@@ -77,9 +77,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
+            return waiting_events.pop(event)
-            del waiting_events[event]
-            return result
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 

tests/multi_bluetooth/ble_gap_connect.py

@@ -33,9 +33,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
+            return waiting_events.pop(event)
-            del waiting_events[event]
-            return result
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 

tests/multi_bluetooth/ble_gap_device_name.py

@@ -49,9 +49,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
+            return waiting_events.pop(event)
-            del waiting_events[event]
-            return result
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 

tests/multi_bluetooth/ble_gatt_data_transfer.py

@@ -76,9 +76,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
+            return waiting_events.pop(event)
-            del waiting_events[event]
-            return result
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 

tests/multi_bluetooth/ble_gattc_discover_services.py

@@ -55,9 +55,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
+            return waiting_events.pop(event)
-            del waiting_events[event]
-            return result
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 

tests/multi_bluetooth/ble_mtu.py

@@ -87,9 +87,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
+            return waiting_events.pop(event)
-            del waiting_events[event]
-            return result
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))