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

am 1615ccc8: am e1df8224: Merge change 23173 into donut

Browse Source 
Merge commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf' into eclair-plus-aosp

* commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
This commit is contained in:
Brett Chabot
2009-08-28 13:52:53 -07:00
committed by Android Git Automerger
parent e9c69c665b 1615ccc8a4
commit df857eb800
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
View File

@@ -67,7 +67,8 @@ public class LifecycleTest extends ActivityTestsBase {
runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN); runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);
} }
@LargeTest //flaky test, removing from large suite until 1866891 is fixed
//@LargeTest
public void testDialog() throws Exception { public void testDialog() throws Exception {
mIntent = mTopIntent; mIntent = mTopIntent;
runLaunchpad(LaunchpadActivity.LIFECYCLE_DIALOG); runLaunchpad(LaunchpadActivity.LIFECYCLE_DIALOG);