summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-08-28 13:48:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-08-28 13:48:09 -0700
commite1df82248a68282a4d556ce61db09949fc186827 (patch)
treed2bcc254238a9516436791528d6da16e12de0981
parent1e3483780ce4eda729cb2984470fd6964006e4fb (diff)
parent3bb99b3adf9d99bb50bc718ecda2f5944d097dac (diff)
downloadbase-e1df82248a68282a4d556ce61db09949fc186827.tar.gz
Merge change 23173 into donut
* changes: Remove flaky test LifecycleTest.testDialog from large continuous suite.
-rw-r--r--tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java3
1 files changed, 2 insertions, 1 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 fdc12ce727b0..80904da5f0d7 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
@@ -67,7 +67,8 @@ public class LifecycleTest extends ActivityTestsBase {
runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);
}
- @LargeTest
+ //flaky test, removing from large suite until 1866891 is fixed
+ //@LargeTest
public void testDialog() throws Exception {
mIntent = mTopIntent;
runLaunchpad(LaunchpadActivity.LIFECYCLE_DIALOG);