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

Commit 353c3bae authored by phweiss's avatar phweiss
Browse files

Increase timeout for flaky testCACertLoader()

Bug: 37535489
Bug: 38045871
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java
Change-Id: I5778082973af7c6d4d719b83e334fec552b0a89e
parent fad4097b
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon
        stateChangedLatch = new CountDownLatch(mSecurityController.hasWorkProfile() ? 2 : 1);
        mSecurityController.addCallback(this);

        assertTrue(stateChangedLatch.await(1, TimeUnit.SECONDS));
        assertTrue(stateChangedLatch.await(3, TimeUnit.SECONDS));
        assertFalse(mSecurityController.hasCACertInCurrentUser());

        // With a CA cert
@@ -116,7 +116,7 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon
        mSecurityController.new CACertLoader()
                           .execute(0);

        assertTrue(stateChangedLatch.await(1, TimeUnit.SECONDS));
        assertTrue(stateChangedLatch.await(3, TimeUnit.SECONDS));
        assertTrue(mSecurityController.hasCACertInCurrentUser());

        // Exception
@@ -130,7 +130,7 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon
        mSecurityController.new CACertLoader()
                           .execute(0);

        assertFalse(stateChangedLatch.await(1, TimeUnit.SECONDS));
        assertFalse(stateChangedLatch.await(3, TimeUnit.SECONDS));
        assertTrue(mSecurityController.hasCACertInCurrentUser());
        // The retry takes 30s
        //assertTrue(stateChangedLatch.await(31, TimeUnit.SECONDS));