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

Commit a320be02 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by Android (Google) Code Review
Browse files

Merge "Skip flaky AppStandbyTests in presubmit" into sc-dev

parents 9882c62f d1ac676e

services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java

+39 −2
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ import android.util.Pair; 
import android.view.Display;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -103,7 +104,6 @@ import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -502,6 +502,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testBoundWidgetPackageExempt() throws Exception {

        assumeTrue(mInjector.getContext().getSystemService(AppWidgetManager.class) != null);

        assertEquals(STANDBY_BUCKET_ACTIVE,
@@ -584,6 +585,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testIsAppIdle_Charging() throws Exception {

        TestParoleListener paroleListener = new TestParoleListener();

        mController.addListener(paroleListener);
@@ -616,6 +618,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testIsAppIdle_Enabled() throws Exception {

        setChargingState(mController, false);

        TestParoleListener paroleListener = new TestParoleListener();
@@ -715,6 +718,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testBuckets() throws Exception {

        assertTimeout(mController, 0, STANDBY_BUCKET_NEVER);
@@ -747,6 +751,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testSetAppStandbyBucket() throws Exception {

        // For a known package, standby bucket should be set properly

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);
@@ -766,6 +771,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testAppStandbyBucketOnInstallAndUninstall() throws Exception {

        // On package install, standby bucket should be ACTIVE

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_UNKNOWN);
@@ -784,6 +790,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testScreenTimeAndBuckets() throws Exception {

        mInjector.setDisplayOn(false);
@@ -807,6 +814,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testForcedIdle() throws Exception {

        mController.forceIdleState(PACKAGE_1, USER_ID, true);

        assertEquals(STANDBY_BUCKET_RARE, getStandbyBucket(mController, PACKAGE_1));
@@ -819,6 +827,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testNotificationEvent() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertEquals(STANDBY_BUCKET_ACTIVE, getStandbyBucket(mController, PACKAGE_1));
@@ -832,6 +841,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testSlicePinnedEvent() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertEquals(STANDBY_BUCKET_ACTIVE, getStandbyBucket(mController, PACKAGE_1));
@@ -845,6 +855,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testSlicePinnedPrivEvent() throws Exception {

        mController.forceIdleState(PACKAGE_1, USER_ID, true);

        reportEvent(mController, SLICE_PINNED_PRIV, mInjector.mElapsedRealtime, PACKAGE_1);
@@ -852,6 +863,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testPredictionTimedOut() throws Exception {

        // Set it to timeout or usage, so that prediction can override it

        mInjector.mElapsedRealtime = HOUR_MS;
@@ -882,6 +894,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testOverrides() throws Exception {

        // Can force to NEVER

        mInjector.mElapsedRealtime = HOUR_MS;
@@ -992,6 +1005,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testTimeout() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1015,6 +1029,7 @@ public class AppStandbyControllerTests { 


    /** Test that timeouts still work properly even if invalid configuration values are set. */

    @Test

    @FlakyTest(bugId = 185169504)

    public void testTimeout_InvalidThresholds() throws Exception {

        mInjector.mSettingsBuilder

                .setLong("screen_threshold_active", -1)
@@ -1052,6 +1067,7 @@ public class AppStandbyControllerTests { 
     * timeout has passed.

     */

    @Test

    @FlakyTest(bugId = 185169504)

    public void testTimeoutBeforeRestricted() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1078,6 +1094,7 @@ public class AppStandbyControllerTests { 
     * Test that an app is put into the RESTRICTED bucket after enough time has passed.

     */

    @Test

    @FlakyTest(bugId = 185169504)

    public void testRestrictedDelay() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1100,6 +1117,7 @@ public class AppStandbyControllerTests { 
     * Test that an app is put into the RESTRICTED bucket after enough time has passed.

     */

    @Test

    @FlakyTest(bugId = 185169504)

    public void testRestrictedDelay_DelayChange() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1124,6 +1142,7 @@ public class AppStandbyControllerTests { 
     * a low bucket after the RESTRICTED timeout.

     */

    @Test

    @FlakyTest(bugId = 185169504)

    public void testRestrictedTimeoutOverridesRestoredLowBucketPrediction() throws Exception {

        reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1160,6 +1179,7 @@ public class AppStandbyControllerTests { 
     * a low bucket after the RESTRICTED timeout.

     */

    @Test

    @FlakyTest(bugId = 185169504)

    public void testRestrictedTimeoutOverridesPredictionLowBucket() throws Exception {

        reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1);
@@ -1187,6 +1207,7 @@ public class AppStandbyControllerTests { 
     * interaction.

     */

    @Test

    @FlakyTest(bugId = 185169504)

    public void testSystemInteractionOverridesRestrictedTimeout() throws Exception {

        reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1213,6 +1234,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testRestrictedBucketDisabled() throws Exception {

        mInjector.mIsRestrictedBucketEnabled = false;

        // Get the controller to read the new value. Capturing the ContentObserver isn't possible
@@ -1238,6 +1260,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testRestrictedBucket_EnabledToDisabled() throws Exception {

        reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1);

        mInjector.mElapsedRealtime += RESTRICTED_THRESHOLD;
@@ -1255,6 +1278,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testPredictionRaiseFromRestrictedTimeout_highBucket() throws Exception {

        reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1);
@@ -1272,6 +1296,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testPredictionRaiseFromRestrictedTimeout_lowBucket() throws Exception {

        reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1);
@@ -1289,6 +1314,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testCascadingTimeouts() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1312,6 +1338,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testOverlappingTimeouts() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1343,6 +1370,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testSystemInteractionTimeout() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        // Fast forward to RARE
@@ -1366,6 +1394,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testInitialForegroundServiceTimeout() throws Exception {

        mInjector.mElapsedRealtime = 1 * RARE_THRESHOLD + 100;

        // Make sure app is in NEVER bucket
@@ -1399,6 +1428,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testPredictionNotOverridden() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1424,8 +1454,8 @@ public class AppStandbyControllerTests { 
        assertBucket(STANDBY_BUCKET_ACTIVE);

    }



    @Ignore

    @Test

    @FlakyTest(bugId = 185169504)

    public void testPredictionStrikesBack() throws Exception {

        reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);

        assertBucket(STANDBY_BUCKET_ACTIVE);
@@ -1451,6 +1481,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testSystemForcedFlags_NotAddedForUserForce() throws Exception {

        final int expectedReason = REASON_MAIN_FORCED_BY_USER;

        mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_RESTRICTED,
@@ -1465,6 +1496,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testSystemForcedFlags_AddedForSystemForce() throws Exception {

        mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE,

                REASON_MAIN_DEFAULT);
@@ -1487,6 +1519,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testSystemForcedFlags_SystemForceChangesBuckets() throws Exception {

        mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE,

                REASON_MAIN_DEFAULT);
@@ -1524,6 +1557,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testRestrictApp_MainReason() throws Exception {

        mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE,

                REASON_MAIN_DEFAULT);
@@ -1598,6 +1632,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testUserInteraction_CrossProfile() throws Exception {

        mInjector.mRunningUsers = new int[] {USER_ID, USER_ID2, USER_ID3};

        mInjector.mCrossProfileTargets = Arrays.asList(USER_HANDLE_USER2);
@@ -1621,6 +1656,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testUnexemptedSyncScheduled() throws Exception {

        rearmLatch(PACKAGE_1);

        mController.addListener(mListener);
@@ -1642,6 +1678,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    @FlakyTest(bugId = 185169504)

    public void testExemptedSyncScheduled() throws Exception {

        setAndAssertBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_RARE, REASON_MAIN_FORCED_BY_SYSTEM);

        mInjector.mDeviceIdleMode = true;