diff options
3 files changed, 49 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/power/TEST_MAPPING b/services/core/java/com/android/server/power/TEST_MAPPING new file mode 100644 index 000000000000..acf3f79e3626 --- /dev/null +++ b/services/core/java/com/android/server/power/TEST_MAPPING @@ -0,0 +1,45 @@ +{ + "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"} + ] + } + ] +} diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java index 81fb0ec3bf53..13643a09daaa 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -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(); diff --git a/services/tests/servicestests/src/com/android/server/power/batterysaver/FileUpdaterTest.java b/services/tests/servicestests/src/com/android/server/power/batterysaver/FileUpdaterTest.java index 89c7dd45e9d3..ecdc58e4549d 100644 --- a/services/tests/servicestests/src/com/android/server/power/batterysaver/FileUpdaterTest.java +++ b/services/tests/servicestests/src/com/android/server/power/batterysaver/FileUpdaterTest.java @@ -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. |