commit 52fdfddc7bf722743d3fc4e178c1371a823025ff
author Ady Abraham <adyabr@google.com> Tue Jun 17 16:05:28 2025 -0700
committer Ady Abraham <adyabr@google.com> Tue Jun 17 16:05:28 2025 -0700
tree 6cb2a1a5c27cbfe6a37b1e0242a528be9f2c38d0
parent 4f1389a793d5a898fb63b724f58c2a7d24fd693d

ChoreographerTest: deflake testPostFrameCallbackWithoutDelay

Bug: 421119185
Test: presubmit
Flag: EXEMPT: bugfix
Change-Id: I70403b5656022cd7ac006801d63179cab445b02a

tests/surfacecontrol/src/android/view/surfacecontrol/cts/ChoreographerTest.java

diff --git a/tests/surfacecontrol/src/android/view/surfacecontrol/cts/ChoreographerTest.java b/tests/surfacecontrol/src/android/view/surfacecontrol/cts/ChoreographerTest.java
index 4176803..d4bf0a4 100644
--- a/tests/surfacecontrol/src/android/view/surfacecontrol/cts/ChoreographerTest.java
+++ b/tests/surfacecontrol/src/android/view/surfacecontrol/cts/ChoreographerTest.java
@@ -220,7 +220,8 @@
             ArgumentCaptor<Long> frameTimeNanosCaptor2 = ArgumentCaptor.forClass(Long.class);
             verify(addedFrameCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1))
                     .doFrame(frameTimeNanosCaptor1.capture());
-            verify(addedFrameCallback2, times(1)).doFrame(frameTimeNanosCaptor2.capture());
+            verify(addedFrameCallback2, timeout(NOMINAL_VSYNC_PERIOD).times(1))
+                    .doFrame(frameTimeNanosCaptor2.capture());
             verifyNoMoreInteractions(removedFrameCallback);
 
             assertTimeDeltaLessThan(frameTimeNanosCaptor1.getValue() - postTimeNanos,
@@ -237,7 +238,8 @@
 
             verify(addedFrameCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(2))
                     .doFrame(frameTimeNanosCaptor1.capture());
-            verify(addedFrameCallback2, times(1)).doFrame(frameTimeNanosCaptor2.capture());
+            verify(addedFrameCallback2, timeout(NOMINAL_VSYNC_PERIOD).times(1))
+                    .doFrame(frameTimeNanosCaptor2.capture());
             verifyNoMoreInteractions(removedFrameCallback);
             assertTimeDeltaLessThan(frameTimeNanosCaptor1.getAllValues().get(1) - postTimeNanos,
                     NOMINAL_VSYNC_PERIOD * 10 * NANOS_PER_MS);