Remove "retry" module dependency in Mainline Nearby Fast Pair e2e tests.
The "retry" module depend on some deprecated modules which fail to
import to AOSP. We should remove "retry" module dependency in
Mainline Nearby Fast Pair e2e tests.
Ignore-AOSP-First: nearby_not_in_aosp_yet
Test: atest -v CtsNearbyMultiDevicesTestSuite
Bug: 230685499
Change-Id: I0af8c06c625864d11d7a6e98fa9879b6ca9e1229
diff --git a/nearby/tests/multidevices/host/AndroidTest.xml b/nearby/tests/multidevices/host/AndroidTest.xml
index 5926cc1..43cf136 100644
--- a/nearby/tests/multidevices/host/AndroidTest.xml
+++ b/nearby/tests/multidevices/host/AndroidTest.xml
@@ -36,7 +36,6 @@
<!-- Any python dependencies can be specified and will be installed with pip -->
<!-- TODO(b/225958696): Import python dependencies -->
<option name="dep-module" value="mobly" />
- <option name="dep-module" value="retry" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
<option name="force-skip-system-props" value="true" /> <!-- avoid restarting device -->
diff --git a/nearby/tests/multidevices/host/test_helper/fast_pair_provider_simulator.py b/nearby/tests/multidevices/host/test_helper/fast_pair_provider_simulator.py
index d6484fb..592c4f1 100644
--- a/nearby/tests/multidevices/host/test_helper/fast_pair_provider_simulator.py
+++ b/nearby/tests/multidevices/host/test_helper/fast_pair_provider_simulator.py
@@ -14,10 +14,12 @@
"""Fast Pair provider simulator role."""
+import time
+
from mobly import asserts
from mobly.controllers import android_device
+from mobly.controllers.android_device_lib import jsonrpc_client_base
from mobly.controllers.android_device_lib import snippet_event
-import retry
from typing import Optional
from test_helper import event_helper
@@ -104,7 +106,6 @@
"""Tears down the Fast Pair provider simulator."""
self._ad.fp.teardownProviderSimulator()
- @retry.retry(tries=3)
def get_ble_mac_address(self) -> str:
"""Gets Bluetooth low energy mac address of the provider simulator.
@@ -115,7 +116,11 @@
Returns:
The BLE mac address of the Fast Pair provider simulator.
"""
- return self._ad.fp.getBluetoothLeAddress()
+ for _ in range(3):
+ try:
+ return self._ad.fp.getBluetoothLeAddress()
+ except jsonrpc_client_base.ApiError:
+ time.sleep(1)
def wait_for_discoverable_mode(self, timeout_seconds: int) -> None:
"""Waits onScanModeChange event to ensure provider is discoverable.