diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-05-06 21:55:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-06 21:55:50 +0000 |
| commit | a7bb7b2572e1d40a12d9295bdf60c8818b0b3ab0 (patch) | |
| tree | 0714312451a500b5af23def82121fee6df1604d9 | |
| parent | dc1fd157b6eba0ccc9d2f2be178558ea1bb67f4b (diff) | |
| parent | 273f6ddeae84d7f15cffb709a3480ba27053765c (diff) | |
| download | Car-a7bb7b2572e1d40a12d9295bdf60c8818b0b3ab0.tar.gz | |
Merge "Fix flaky test CarUserManagerLifecycleEventFilterTest" into tm-dev
| -rw-r--r-- | tests/android_car_api_test/src/android/car/apitest/CarUserManagerLifecycleEventFilterTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarUserManagerLifecycleEventFilterTest.java b/tests/android_car_api_test/src/android/car/apitest/CarUserManagerLifecycleEventFilterTest.java index 5c083224d9..a25c6932be 100644 --- a/tests/android_car_api_test/src/android/car/apitest/CarUserManagerLifecycleEventFilterTest.java +++ b/tests/android_car_api_test/src/android/car/apitest/CarUserManagerLifecycleEventFilterTest.java @@ -137,9 +137,11 @@ public final class CarUserManagerLifecycleEventFilterTest extends CarMultiUserTe // Switch back to the initial user switchUser(initialUserId); - // Wait to receive events. + // Wait for all listeners to receive all expected events. waitUntil("Listeners have not received all expected events", EVENTS_TIMEOUT_MS, - () -> mListeners[4].listener.getAllReceivedEvents().size() == 2); + () -> (mListeners[0].listener.getAllReceivedEvents().size() == 3 + && mListeners[1].listener.getAllReceivedEvents().size() == 3 + && mListeners[4].listener.getAllReceivedEvents().size() == 2)); // unregister listeners. for (Listener listener : mListeners) { |