Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8f66df8 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Fix VirtualDisplayAdapterTest flakiness 

Add some time to allow the async callback to be called.

Fix: 390779322
Test: atest VirtualDisplayAdapterTest#virtualDisplayStateChange_propagatesToSurfaceControl --iterations=30
Flag: EXEMPT test improvement
Change-Id: Iefea6d32a48e2feecba853da5fc3ac592d8156f6
parent 40af2bbb

services/tests/displayservicetests/src/com/android/server/display/VirtualDisplayAdapterTest.java

+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyFloat;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -73,6 +74,8 @@ public class VirtualDisplayAdapterTest { 
    private static final float DEFAULT_BRIGHTNESS = 0.34f;

    private static final float DIM_BRIGHTNESS = 0.12f;



    private static final int CALLBACK_TIMEOUT_MILLIS = 3000;



    @Rule

    public final TestableContext mContext = new TestableContext(

            InstrumentationRegistry.getInstrumentation().getContext());
@@ -437,7 +440,7 @@ public class VirtualDisplayAdapterTest { 
        stateOnRunnable.run();

        verify(mMockSufaceControlDisplayFactory)

                .setDisplayPowerMode(displayToken, SurfaceControl.POWER_MODE_NORMAL);

        verify(mMockCallback).onResumed();

        verify(mMockCallback, timeout(CALLBACK_TIMEOUT_MILLIS)).onResumed();



        // Requesting the same display state is a no-op

        Runnable stateOnSecondRunnable = device.requestDisplayStateLocked(
@@ -453,7 +456,7 @@ public class VirtualDisplayAdapterTest { 
        stateOffRunnable.run();

        verify(mMockSufaceControlDisplayFactory)

                .setDisplayPowerMode(displayToken, SurfaceControl.POWER_MODE_OFF);

        verify(mMockCallback).onPaused();

        verify(mMockCallback, timeout(CALLBACK_TIMEOUT_MILLIS)).onPaused();

    }



    @EnableFlags(