Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include all BatteryStatsTests in presubmit"

Browse Source
This commit is contained in:
Dmitri Plotnikov
2021-07-31 00:35:59 +00:00
committed by Android (Google) Code Review
parent 606d6ead5b 85f38b70f5
commit 3d36f5d828
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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) {