summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marin Shalamanov <shalamanov@google.com> 2021-03-02 12:28:51 +0100
committer Marin Shalamanov <shalamanov@google.com> 2021-03-02 18:49:32 +0100
commit439336a36cccf32b6bb3bc8d855395a29b9fdfd3 (patch)
tree8cc3ed16ba5af2ee5c3cd78716e079e258f58ee3
parent09b6e32c1d812bbbf869826ea2cfecdd53d4b6bb (diff)
Fix flaky test in LocalDisplayAdapter
This fixes the flaky test testDisplayChange_withStaleDesiredDisplayModeSpecs. Setting desired display mode specs is async operation so we have to wait for the handler to complete before proceeding. Bug: 181455762 Bug: 181409641 Bug: 181408874 Test: run `atest LocalDisplayAdapterTest` 20 times with and without this change. There were 3 failures w/o this change and 0 with. Change-Id: I667e7cf96765ba58868032825d246ea034a80ee0
-rw-r--r--services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java b/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java
index 18184b0a82af..f1d8e6c167d7 100644
--- a/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java
@@ -592,6 +592,7 @@ public class LocalDisplayAdapterTest {
new DisplayModeDirector.RefreshRateRange(60f, 60f),
new DisplayModeDirector.RefreshRateRange(60f, 60f)
));
+ waitForHandlerToComplete(mHandler, HANDLER_WAIT_MS);
verify(mSurfaceControlProxy).setDesiredDisplayModeSpecs(display.token,
new SurfaceControl.DesiredDisplayModeSpecs(
/* baseModeId */ 0,