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

Commit 3d36f5d8 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Include all BatteryStatsTests in presubmit"

parents 606d6ead 85f38b70

core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java

+0 −2
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ public class BatteryStatsNoteTest extends TestCase { 
    }



    @SmallTest

    @SkipPresubmit("b/180015146")

    public void testAlarmStartAndFinishLocked() throws Exception {

        final MockClock clocks = new MockClock(); // holds realtime and uptime in ms

        MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);
@@ -333,7 +332,6 @@ public class BatteryStatsNoteTest extends TestCase { 
    }



    @SmallTest

    @SkipPresubmit("b/180015146")

    public void testAlarmStartAndFinishLocked_workSource() throws Exception {

        final MockClock clocks = new MockClock(); // holds realtime and uptime in ms

        MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);

core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java

+0 −8
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ public class BstatsCpuTimesValidationTest { 
        sPerProcStateTimesAvailable = fgCpuTimes != null;

    }



    @SkipPresubmit("b/184201598 flaky")

    @Test

    public void testCpuFreqTimes() throws Exception {

        if (!sCpuFreqTimesAvailable) {
@@ -215,7 +214,6 @@ public class BstatsCpuTimesValidationTest { 
        batteryOffScreenOn();

    }



    @SkipPresubmit("b/184201598 flaky")

    @Test

    public void testCpuFreqTimes_screenOff() throws Exception {

        if (!sCpuFreqTimesAvailable) {
@@ -278,7 +276,6 @@ public class BstatsCpuTimesValidationTest { 
        batteryOffScreenOn();

    }



    @SkipPresubmit("b/184201598 flaky")

    @Test

    public void testCpuFreqTimes_stateTop() throws Exception {

        if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {
@@ -312,7 +309,6 @@ public class BstatsCpuTimesValidationTest { 
        batteryOffScreenOn();

    }



    @SkipPresubmit("b/184201598 flaky")

    @Test

    public void testIsolatedCpuFreqTimes_stateService() throws Exception {

        if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {
@@ -354,7 +350,6 @@ public class BstatsCpuTimesValidationTest { 
        batteryOffScreenOn();

    }



    @SkipPresubmit("b/185960974 flaky")

    @Test

    public void testCpuFreqTimes_stateTopSleeping() throws Exception {

        if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {
@@ -389,7 +384,6 @@ public class BstatsCpuTimesValidationTest { 
    }



    @Test

    @SkipPresubmit("b/183225190 flaky")

    public void testCpuFreqTimes_stateFgService() throws Exception {

        if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {

            Log.w(TAG, "Skipping " + testName.getMethodName()
@@ -455,7 +449,6 @@ public class BstatsCpuTimesValidationTest { 
        batteryOff();

    }



    @SkipPresubmit("b/184201598 flaky")

    @Test

    public void testCpuFreqTimes_stateBg() throws Exception {

        if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {
@@ -522,7 +515,6 @@ public class BstatsCpuTimesValidationTest { 
        batteryOffScreenOn();

    }



    @SkipPresubmit("b/184201598 flaky")

    @Test

    public void testCpuFreqTimes_trackingDisabled() throws Exception {

        if (!sCpuFreqTimesAvailable || !sPerProcStateTimesAvailable) {