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

Commit 996b2083 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Fix flaky test."

parents 4ed0046c 501247ba

services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ public class RetailDemoModeServiceTest { 
        userInfo.id = TEST_DEMO_USER;

        when(mUm.createUser(anyString(), anyInt())).thenReturn(userInfo);



        setCameraPackage(TEST_CAMERA_PKG);

        mService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);

        assertEquals(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED + " property not set",

                "1", mInjector.systemPropertiesGet(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED));
@@ -157,7 +158,6 @@ public class RetailDemoModeServiceTest { 
        assertTrue("Not registered for " + Intent.ACTION_SCREEN_OFF,

                intentFilter.getValue().hasAction(Intent.ACTION_SCREEN_OFF));



        setCameraPackage(TEST_CAMERA_PKG);

        // Wait for the setup to complete.

        mLatch.await(SETUP_COMPLETE_TIMEOUT_MS, TimeUnit.MILLISECONDS);

        ArgumentCaptor<Integer> flags = ArgumentCaptor.forClass(Integer.class);