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

Merge "Mark no longer flaky tests as non flaky" into rvc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2020-04-02 13:41:55 +00:00
committed by Android (Google) Code Review
parent 56f4b1b9d3 fe0418dedb
commit 4218ce69e5
13 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
View File

@@ -73,7 +73,6 @@ public class AppTransitionTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testKeyguardOverride() { public void testKeyguardOverride() {
mWm.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, false /* alwaysKeepCurrent */); mWm.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, false /* alwaysKeepCurrent */);
mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */); mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */);
@@ -81,7 +80,6 @@ public class AppTransitionTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testKeyguardKeep() { public void testKeyguardKeep() {
mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */); mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */);
mWm.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, false /* alwaysKeepCurrent */); mWm.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, false /* alwaysKeepCurrent */);
@@ -89,7 +87,6 @@ public class AppTransitionTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testForceOverride() { public void testForceOverride() {
mWm.prepareAppTransition(TRANSIT_KEYGUARD_UNOCCLUDE, false /* alwaysKeepCurrent */); mWm.prepareAppTransition(TRANSIT_KEYGUARD_UNOCCLUDE, false /* alwaysKeepCurrent */);
mDc.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, mDc.prepareAppTransition(TRANSIT_ACTIVITY_OPEN,
@@ -105,7 +102,6 @@ public class AppTransitionTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testKeepKeyguard_withCrashing() { public void testKeepKeyguard_withCrashing() {
mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */); mWm.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, false /* alwaysKeepCurrent */);
mWm.prepareAppTransition(TRANSIT_CRASHING_ACTIVITY_CLOSE, false /* alwaysKeepCurrent */); mWm.prepareAppTransition(TRANSIT_CRASHING_ACTIVITY_CLOSE, false /* alwaysKeepCurrent */);
@@ -113,7 +109,6 @@ public class AppTransitionTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testAppTransitionStateForMultiDisplay() { public void testAppTransitionStateForMultiDisplay() {
// Create 2 displays & presume both display the state is ON for ready to display & animate. // Create 2 displays & presume both display the state is ON for ready to display & animate.
final DisplayContent dc1 = createNewDisplay(Display.STATE_ON); final DisplayContent dc1 = createNewDisplay(Display.STATE_ON);
@@ -182,7 +177,6 @@ public class AppTransitionTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testLoadAnimationSafely() { public void testLoadAnimationSafely() {
DisplayContent dc = createNewDisplay(Display.STATE_ON); DisplayContent dc = createNewDisplay(Display.STATE_ON);
assertNull(dc.mAppTransition.loadAnimationSafely( assertNull(dc.mAppTransition.loadAnimationSafely(

3
services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java
View File

@@ -67,7 +67,6 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void clipAfterAnim_boundsLayerIsCreated() { public void clipAfterAnim_boundsLayerIsCreated() {
mActivity.mNeedsAnimationBoundsLayer = true; mActivity.mNeedsAnimationBoundsLayer = true;
@@ -91,7 +90,6 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void clipAfterAnim_boundsLayerIsDestroyed() { public void clipAfterAnim_boundsLayerIsDestroyed() {
mActivity.mNeedsAnimationBoundsLayer = true; mActivity.mNeedsAnimationBoundsLayer = true;
mActivity.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */, mActivity.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */,
@@ -126,7 +124,6 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void clipNoneAnim_boundsLayerIsNotCreated() { public void clipNoneAnim_boundsLayerIsNotCreated() {
mActivity.mNeedsAnimationBoundsLayer = false; mActivity.mNeedsAnimationBoundsLayer = false;

2
services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
View File

@@ -677,7 +677,6 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 149760800)
public void layoutWindowLw_withLongEdgeDisplayCutout() { public void layoutWindowLw_withLongEdgeDisplayCutout() {
addLongEdgeDisplayCutout(); addLongEdgeDisplayCutout();
@@ -698,7 +697,6 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 149760800)
public void layoutWindowLw_withLongEdgeDisplayCutout_never() { public void layoutWindowLw_withLongEdgeDisplayCutout_never() {
addLongEdgeDisplayCutout(); addLongEdgeDisplayCutout();

1
services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java
View File

@@ -277,7 +277,6 @@ public class DisplayPolicyTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testOverlappingWithNavBar() { public void testOverlappingWithNavBar() {
final WindowState targetWin = createApplicationWindow(); final WindowState targetWin = createApplicationWindow();
final WindowFrames winFrame = targetWin.getWindowFrames(); final WindowFrames winFrame = targetWin.getWindowFrames();

3
services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java
View File

@@ -147,19 +147,16 @@ public class DragDropControllerTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testDragFlow() { public void testDragFlow() {
dragFlow(0, ClipData.newPlainText("label", "Test"), 0, 0); dragFlow(0, ClipData.newPlainText("label", "Test"), 0, 0);
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testPerformDrag_NullDataWithGrantUri() { public void testPerformDrag_NullDataWithGrantUri() {
dragFlow(View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ, null, 0, 0); dragFlow(View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ, null, 0, 0);
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testPerformDrag_NullDataToOtherUser() { public void testPerformDrag_NullDataToOtherUser() {
final WindowState otherUsersWindow = final WindowState otherUsersWindow =
createDropTargetWindow("Other user's window", 1 * UserHandle.PER_USER_RANGE); createDropTargetWindow("Other user's window", 1 * UserHandle.PER_USER_RANGE);

1
services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java
View File

@@ -58,7 +58,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@SmallTest @SmallTest
@FlakyTest(detail = "Promote to pre-submit once confirmed stable.")
@Presubmit @Presubmit
@RunWith(WindowTestRunner.class) @RunWith(WindowTestRunner.class)
public class InsetsPolicyTest extends WindowTestsBase { public class InsetsPolicyTest extends WindowTestsBase {

3
services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java
View File

@@ -53,7 +53,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@SmallTest @SmallTest
@FlakyTest(detail = "Promote to pre-submit once confirmed stable.")
@Presubmit @Presubmit
@RunWith(WindowTestRunner.class) @RunWith(WindowTestRunner.class)
public class InsetsStateControllerTest extends WindowTestsBase { public class InsetsStateControllerTest extends WindowTestsBase {
@@ -72,7 +71,6 @@ public class InsetsStateControllerTest extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testStripForDispatch_notOwn() { public void testStripForDispatch_notOwn() {
final WindowState statusBar = createWindow(null, TYPE_APPLICATION, "statusBar"); final WindowState statusBar = createWindow(null, TYPE_APPLICATION, "statusBar");
final WindowState app = createWindow(null, TYPE_APPLICATION, "app"); final WindowState app = createWindow(null, TYPE_APPLICATION, "app");
@@ -291,7 +289,6 @@ public class InsetsStateControllerTest extends WindowTestsBase {
assertNull(getController().getControlsForDispatch(app)); assertNull(getController().getControlsForDispatch(app));
} }
@FlakyTest(bugId = 124088319)
@Test @Test
public void testControlRevoked_animation() { public void testControlRevoked_animation() {
final WindowState statusBar = createWindow(null, TYPE_APPLICATION, "statusBar"); final WindowState statusBar = createWindow(null, TYPE_APPLICATION, "statusBar");

1
services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java
View File

@@ -146,7 +146,6 @@ public class RemoteAnimationControllerTest extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 133372977)
public void testTimeout() throws Exception { public void testTimeout() throws Exception {
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin"); final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mActivityRecord, final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mActivityRecord,

1
services/tests/wmtests/src/com/android/server/wm/TaskPersisterTest.java
View File

@@ -74,7 +74,6 @@ public class TaskPersisterTest {
} }
@Test @Test
@FlakyTest(bugId = 131005232)
public void testTaskIdsPersistence() { public void testTaskIdsPersistence() {
SparseBooleanArray taskIdsOnFile = new SparseBooleanArray(); SparseBooleanArray taskIdsOnFile = new SparseBooleanArray();
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {

1
services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java
View File

@@ -518,7 +518,6 @@ public class TaskPositionerTests extends WindowTestsBase {
assertEquals(expected, actual); assertEquals(expected, actual);
} }
@FlakyTest(bugId = 129492888)
@Test @Test
public void testFinishingMovingWhenBinderDied() { public void testFinishingMovingWhenBinderDied() {
spyOn(mWm.mTaskPositioningController); spyOn(mWm.mTaskPositioningController);

1
services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java
View File

@@ -90,7 +90,6 @@ public class TaskPositioningControllerTests extends WindowTestsBase {
assertNull(mTarget.getDragWindowHandleLocked()); assertNull(mTarget.getDragWindowHandleLocked());
} }
@FlakyTest(bugId = 129507487)
@Test @Test
public void testFinishPositioningWhenAppRequested() { public void testFinishPositioningWhenAppRequested() {
assertFalse(mTarget.isPositioningLocked()); assertFalse(mTarget.isPositioningLocked());

4
services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java
View File

@@ -184,7 +184,6 @@ public class TaskRecordTests extends ActivityTestsBase {
/** Ensures that bounds on freeform stacks are not clipped. */ /** Ensures that bounds on freeform stacks are not clipped. */
@Test @Test
@FlakyTest(bugId = 137879065)
public void testAppBounds_FreeFormBounds() { public void testAppBounds_FreeFormBounds() {
final Rect freeFormBounds = new Rect(mParentBounds); final Rect freeFormBounds = new Rect(mParentBounds);
freeFormBounds.offset(10, 10); freeFormBounds.offset(10, 10);
@@ -194,7 +193,6 @@ public class TaskRecordTests extends ActivityTestsBase {
/** Ensures that fully contained bounds are not clipped. */ /** Ensures that fully contained bounds are not clipped. */
@Test @Test
@FlakyTest(bugId = 137879065)
public void testAppBounds_ContainedBounds() { public void testAppBounds_ContainedBounds() {
final Rect insetBounds = new Rect(mParentBounds); final Rect insetBounds = new Rect(mParentBounds);
insetBounds.inset(5, 5, 5, 5); insetBounds.inset(5, 5, 5, 5);
@@ -203,7 +201,6 @@ public class TaskRecordTests extends ActivityTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 137879065)
public void testFitWithinBounds() { public void testFitWithinBounds() {
final Rect parentBounds = new Rect(10, 10, 200, 200); final Rect parentBounds = new Rect(10, 10, 200, 200);
DisplayContent display = mService.mRootWindowContainer.getDefaultDisplay(); DisplayContent display = mService.mRootWindowContainer.getDefaultDisplay();
@@ -243,7 +240,6 @@ public class TaskRecordTests extends ActivityTestsBase {
/** Tests that the task bounds adjust properly to changes between FULLSCREEN and FREEFORM */ /** Tests that the task bounds adjust properly to changes between FULLSCREEN and FREEFORM */
@Test @Test
@FlakyTest(bugId = 137879065)
public void testBoundsOnModeChangeFreeformToFullscreen() { public void testBoundsOnModeChangeFreeformToFullscreen() {
DisplayContent display = mService.mRootWindowContainer.getDefaultDisplay(); DisplayContent display = mService.mRootWindowContainer.getDefaultDisplay();
ActivityStack stack = new StackBuilder(mRootWindowContainer).setDisplay(display) ActivityStack stack = new StackBuilder(mRootWindowContainer).setDisplay(display)

2
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
View File

@@ -449,7 +449,6 @@ public class WindowStateTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 74078662)
public void testLayoutSeqResetOnReparent() { public void testLayoutSeqResetOnReparent() {
final WindowState app = createWindow(null, TYPE_APPLICATION, "app"); final WindowState app = createWindow(null, TYPE_APPLICATION, "app");
app.mLayoutSeq = 1; app.mLayoutSeq = 1;
@@ -508,7 +507,6 @@ public class WindowStateTests extends WindowTestsBase {
} }
@Test @Test
@FlakyTest(bugId = 74078662)
public void testDisplayCutoutIsCalculatedRelativeToFrame() { public void testDisplayCutoutIsCalculatedRelativeToFrame() {
final WindowState app = createWindow(null, TYPE_APPLICATION, "app"); final WindowState app = createWindow(null, TYPE_APPLICATION, "app");
WindowFrames wf = app.getWindowFrames(); WindowFrames wf = app.getWindowFrames();