diff options
Diffstat (limited to 'tests/AndroidTests')
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java | 4 | ||||
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java b/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java index 80904da..069b697 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java @@ -51,8 +51,8 @@ public class LifecycleTest extends ActivityTestsBase { } //Marking flaky until bug 1164344 is fixed. - @FlakyTest(tolerance=2) - @LargeTest + // @FlakyTest(tolerance=2) + // @LargeTest public void testScreen() throws Exception { mIntent = mTopIntent; runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN); diff --git a/tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java b/tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java index 1a0c2d1..d0fdff4 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java @@ -160,7 +160,8 @@ public class PerformanceCollectorTest extends TestCase { verifyTimingBundle(timing, labels); } - @LargeTest + // TODO: flaky test + // @LargeTest public void testSimpleSequence() throws Exception { MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter(); mPerfCollector.setPerformanceResultsWriter(writer); @@ -192,7 +193,8 @@ public class PerformanceCollectorTest extends TestCase { verifyTimingBundle(timing, labels); } - @LargeTest + // TODO: flaky test + // @LargeTest public void testLongSequence() throws Exception { MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter(); mPerfCollector.setPerformanceResultsWriter(writer); |