Update the event timeout seconds according to snippet side.
Test: atest -v CtsSeekerDiscoverProviderTest
BUG: 216079944
Change-Id: I2b50eb83203b9a7bd910d09dcee444402b7cdffd
diff --git a/nearby/tests/multidevices/clients/test_support/fastpair_provider/src/android/nearby/fastpair/provider/FastPairSimulator.java b/nearby/tests/multidevices/clients/test_support/fastpair_provider/src/android/nearby/fastpair/provider/FastPairSimulator.java
index 6c3f933..aa7daa6 100644
--- a/nearby/tests/multidevices/clients/test_support/fastpair_provider/src/android/nearby/fastpair/provider/FastPairSimulator.java
+++ b/nearby/tests/multidevices/clients/test_support/fastpair_provider/src/android/nearby/fastpair/provider/FastPairSimulator.java
@@ -163,6 +163,10 @@
public static final String TAG = "FastPairSimulator";
private final Logger mLogger;
+ private static final int BECOME_DISCOVERABLE_TIMEOUT_SEC = 3;
+
+ private static final int SCAN_MODE_REFRESH_SEC = 30;
+
/**
* Headphones. Generated by
* http://bluetooth-pentest.narod.ru/software/bluetooth_class_of_device-service_generator.html
@@ -2056,7 +2060,7 @@
if (isDiscoverable()) {
mIsDiscoverableLatch.countDown();
}
- if (mIsDiscoverableLatch.await(3, TimeUnit.SECONDS)) {
+ if (mIsDiscoverableLatch.await(BECOME_DISCOVERABLE_TIMEOUT_SEC, TimeUnit.SECONDS)) {
mLogger.log("Successfully became switched discoverable mode %s", discoverable);
} else {
throw new TimeoutException();
@@ -2074,8 +2078,9 @@
method.invoke(mBluetoothAdapter, scanMode);
if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
- mRevertDiscoverableFuture = mExecutor.schedule(
- () -> setScanMode(SCAN_MODE_CONNECTABLE), 30, TimeUnit.SECONDS);
+ mRevertDiscoverableFuture =
+ mExecutor.schedule(() -> setScanMode(SCAN_MODE_CONNECTABLE),
+ SCAN_MODE_REFRESH_SEC, TimeUnit.SECONDS);
}
} catch (Exception e) {
mLogger.log(e, "Error setting scan mode to %d", scanMode);
diff --git a/nearby/tests/multidevices/clients/test_support/fastpair_provider/src/android/nearby/fastpair/provider/OreoFastPairAdvertiser.java b/nearby/tests/multidevices/clients/test_support/fastpair_provider/src/android/nearby/fastpair/provider/OreoFastPairAdvertiser.java
index bff77ef..bb77c11 100644
--- a/nearby/tests/multidevices/clients/test_support/fastpair_provider/src/android/nearby/fastpair/provider/OreoFastPairAdvertiser.java
+++ b/nearby/tests/multidevices/clients/test_support/fastpair_provider/src/android/nearby/fastpair/provider/OreoFastPairAdvertiser.java
@@ -97,6 +97,7 @@
address,
new SimpleDateFormat("HH:mm:ss:SSS", Locale.US)
.format(Calendar.getInstance().getTime()));
+ // Implicitly start the advertising once BLE address callback arrived.
simulator.setBleAddress(address);
}
}
diff --git a/nearby/tests/multidevices/host/seeker_discover_provider_test.py b/nearby/tests/multidevices/host/seeker_discover_provider_test.py
index f875250..a52ca15 100644
--- a/nearby/tests/multidevices/host/seeker_discover_provider_test.py
+++ b/nearby/tests/multidevices/host/seeker_discover_provider_test.py
@@ -16,8 +16,10 @@
DEFAULT_MODEL_ID = '00000C'
# Default public key to simulate as registered headsets.
DEFAULT_ANTI_SPOOFING_KEY = 'Cbj9eCJrTdDgSYxLkqtfADQi86vIaMvxJsQ298sZYWE='
-# Default time in seconds for events waiting.
-DEFAULT_TIMEOUT_SEC = 60
+# Time in seconds for events waiting.
+BECOME_DISCOVERABLE_TIMEOUT_SEC = 10
+START_ADVERTISING_TIMEOUT_SEC = 5
+SCAN_TIMEOUT_SEC = 30
# Abbreviations for common use type.
FastPairProviderSimulator = fast_pair_provider_simulator.FastPairProviderSimulator
@@ -47,8 +49,8 @@
super().setup_test()
self._provider.start_provider_simulator(DEFAULT_MODEL_ID,
DEFAULT_ANTI_SPOOFING_KEY)
- self._provider.wait_for_discoverable_mode(DEFAULT_TIMEOUT_SEC)
- self._provider.wait_for_advertising_start(DEFAULT_TIMEOUT_SEC)
+ self._provider.wait_for_discoverable_mode(BECOME_DISCOVERABLE_TIMEOUT_SEC)
+ self._provider.wait_for_advertising_start(START_ADVERTISING_TIMEOUT_SEC)
self._seeker.start_scan()
def teardown_test(self) -> None:
@@ -62,7 +64,7 @@
def test_seeker_start_scanning_find_provider(self) -> None:
provider_ble_mac_address = self._provider.get_ble_mac_address()
self._seeker.wait_and_assert_provider_found(
- timeout_seconds=DEFAULT_TIMEOUT_SEC,
+ timeout_seconds=SCAN_TIMEOUT_SEC,
expected_model_id=DEFAULT_MODEL_ID,
expected_ble_mac_address=provider_ble_mac_address)