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

Commit 5f4e3f8f authored by JW Wang's avatar JW Wang
Browse files

Exhaust due runnables before time-leap (1/n) 

Fix test failures caused by runnables incorrectly executed
after time-leap.

Bug: 178675924
Test: atest PackageWatchdogTest
Change-Id: Iacad3a2f5a26e6bd28cd04e96a43d1c6d917513a
parent ecb4816e

tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -850,7 +850,6 @@ public class PackageWatchdogTest { 
        watchdog.startObservingHealth(observer, Arrays.asList(APP_A, APP_B), Long.MAX_VALUE);

        watchdog.startObservingHealth(observer, Arrays.asList(APP_A, APP_B), Long.MAX_VALUE);

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)),

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)),

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

        mTestLooper.dispatchAll();

        moveTimeForwardAndDispatch(PackageWatchdog.DEFAULT_TRIGGER_FAILURE_DURATION_MS + 1);

        moveTimeForwardAndDispatch(PackageWatchdog.DEFAULT_TRIGGER_FAILURE_DURATION_MS + 1);

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)),

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)),

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

                PackageWatchdog.FAILURE_REASON_UNKNOWN);
@@ -862,7 +861,6 @@ public class PackageWatchdogTest { 




        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_B, VERSION_CODE)),

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_B, VERSION_CODE)),

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

        mTestLooper.dispatchAll();

        moveTimeForwardAndDispatch(PackageWatchdog.DEFAULT_TRIGGER_FAILURE_DURATION_MS - 1);

        moveTimeForwardAndDispatch(PackageWatchdog.DEFAULT_TRIGGER_FAILURE_DURATION_MS - 1);

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_B, VERSION_CODE)),

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_B, VERSION_CODE)),

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

                PackageWatchdog.FAILURE_REASON_UNKNOWN);
@@ -933,11 +931,9 @@ public class PackageWatchdogTest { 
        // Raise 2 failures at t=0 and t=900 respectively

        // Raise 2 failures at t=0 and t=900 respectively

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)),

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)),

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

        mTestLooper.dispatchAll();

        moveTimeForwardAndDispatch(900);

        moveTimeForwardAndDispatch(900);

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)),

        watchdog.onPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)),

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

                PackageWatchdog.FAILURE_REASON_UNKNOWN);

        mTestLooper.dispatchAll();





        // Raise 2 failures at t=1100

        // Raise 2 failures at t=1100

        moveTimeForwardAndDispatch(200);

        moveTimeForwardAndDispatch(200);
@@ -1312,6 +1308,8 @@ public class PackageWatchdogTest { 
    }

    }





    private void moveTimeForwardAndDispatch(long milliSeconds) {

    private void moveTimeForwardAndDispatch(long milliSeconds) {

        // Exhaust all due runnables now which shouldn't be executed after time-leap

        mTestLooper.dispatchAll();

        mTestClock.moveTimeForward(milliSeconds);

        mTestClock.moveTimeForward(milliSeconds);

        mTestLooper.moveTimeForward(milliSeconds);

        mTestLooper.moveTimeForward(milliSeconds);

        mTestLooper.dispatchAll();

        mTestLooper.dispatchAll();