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

Commit 61e96c4a authored by Kweku Adams's avatar Kweku Adams
Browse files

Enable continuous testing for Battery Saver code. 

Enabling pre- and post-submit tests for Battery Saver so we can catch
regressions faster.

Also tag flaky tests.

Bug: 146454935
Test: Navigate to directory and run `atest`
Change-Id: I34cc570f738461b4e6d9736aea25c0d31f6b5f0c
parent 27392455

services/core/java/com/android/server/power/TEST_MAPPING

0 → 100644
+45 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "CtsBatterySavingTestCases",

      "options": [

        {"exclude-annotation": "androidx.test.filters.LargeTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"}

      ]

    },

    {

      "name": "FrameworksMockingServicesTests",

      "options": [

        {"include-filter": "com.android.server.power"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"}

      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        {"include-filter": "com.android.server.power"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {

          "exclude-filter": "com.android.server.power.PowerManagerServiceTest#testWakefulnessAwake_ShouldWakeUpWhenPluggedIn"

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "CtsBatterySavingTestCases"

    },

    {

      "name": "FrameworksMockingServicesTests",

      "options": [

        {"include-filter": "com.android.server.power"}

      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        {"include-filter": "com.android.server.power"}

      ]

    }

  ]

}

services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import android.os.PowerManager; 
import android.os.PowerSaveState;

import android.os.SystemClock;

import android.os.UserHandle;

import android.platform.test.annotations.FlakyTest;

import android.provider.Settings;

import android.test.mock.MockContentResolver;

import android.view.Display;
@@ -734,6 +735,7 @@ public class PowerManagerServiceTest { 
        assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_ASLEEP);

    }



    @FlakyTest

    @Test

    public void testInattentiveSleep_goesToSleepWithWakeLock() throws Exception {

        final String pkg = mContextSpy.getOpPackageName();

services/tests/servicestests/src/com/android/server/power/batterysaver/FileUpdaterTest.java

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify; 
import android.content.Context;

import android.os.Handler;

import android.os.Looper;

import android.platform.test.annotations.FlakyTest;

import android.util.ArrayMap;



import androidx.test.InstrumentationRegistry;
@@ -328,6 +329,7 @@ public class FileUpdaterTest { 
        veriryWtf(0);

    }



    @FlakyTest

    @Test

    public void testAll() throws Exception {

        // Run multiple tests on the single target instance.