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

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

6 files changed, 6 insertions, 18 deletions

diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index 0f22daff8..327822a01 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/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]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_gap_connect.py b/tests/multi_bluetooth/ble_gap_connect.py
index 2c1d2cbbc..95d1be7ba 100644
--- a/tests/multi_bluetooth/ble_gap_connect.py
+++ b/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]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py b/tests/multi_bluetooth/ble_gap_device_name.py
index e7202170b..556068114 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py
+++ b/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]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py b/tests/multi_bluetooth/ble_gatt_data_transfer.py
index e8249b3da..861cb49fc 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py
+++ b/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]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_gattc_discover_services.py b/tests/multi_bluetooth/ble_gattc_discover_services.py
index 00bb94bba..f6ee5fa00 100644
--- a/tests/multi_bluetooth/ble_gattc_discover_services.py
+++ b/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]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_mtu.py b/tests/multi_bluetooth/ble_mtu.py
index 73c77e246..f202ec764 100644
--- a/tests/multi_bluetooth/ble_mtu.py
+++ b/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]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))