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

Commit 153badbf authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix flaky tests 

Need to wait until handlers are idle because the display gets
frozen when adding a new one, which will screw up starting window
creating.

Test: AppWindowContainerControllerTests x1000
Change-Id: Ic949efc4e53abe2a580eb5c410f5905f0361a75a
Fixes: 62037783
parent ff389264

services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java

+7 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ class WindowTestsBase { 
                "mChildAppWindowAbove");

        mChildAppWindowBelow = createCommonWindow(mAppWindow, TYPE_APPLICATION_MEDIA_OVERLAY,

                "mChildAppWindowBelow");



        // Adding a display will cause freezing the display. Make sure to wait until it's unfrozen

        // to not run into race conditions with the tests.

        waitUntilHandlersIdle();

    }



    @After
@@ -135,6 +139,9 @@ class WindowTestsBase { 
            mDisplayContent.removeImmediately();

            sWm.mInputMethodTarget = null;

        }



        // Wait until everything is really cleaned up.

        waitUntilHandlersIdle();

    }



    private WindowState createCommonWindow(WindowState parent, int type, String name) {