Merge "Disable tests flaky on flame" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
63d515d10e
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen
|
|||||||
|
|
||||||
import android.platform.test.annotations.Presubmit
|
import android.platform.test.annotations.Presubmit
|
||||||
import android.view.Surface
|
import android.view.Surface
|
||||||
|
import androidx.test.filters.FlakyTest
|
||||||
import androidx.test.filters.RequiresDevice
|
import androidx.test.filters.RequiresDevice
|
||||||
import com.android.server.wm.flicker.dsl.FlickerBuilder
|
import com.android.server.wm.flicker.dsl.FlickerBuilder
|
||||||
import com.android.server.wm.flicker.dsl.runWithFlicker
|
import com.android.server.wm.flicker.dsl.runWithFlicker
|
||||||
@@ -162,6 +163,7 @@ class EnterLegacySplitScreenTest(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@FlakyTest(bugId = 173875043)
|
||||||
@Test
|
@Test
|
||||||
fun testNonResizeableNotDocked() {
|
fun testNonResizeableNotDocked() {
|
||||||
val testTag = "testNonResizeableNotDocked"
|
val testTag = "testNonResizeableNotDocked"
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen
|
|||||||
|
|
||||||
import android.platform.test.annotations.Presubmit
|
import android.platform.test.annotations.Presubmit
|
||||||
import android.view.Surface
|
import android.view.Surface
|
||||||
|
import androidx.test.filters.FlakyTest
|
||||||
import androidx.test.filters.RequiresDevice
|
import androidx.test.filters.RequiresDevice
|
||||||
import com.android.server.wm.flicker.dsl.FlickerBuilder
|
import com.android.server.wm.flicker.dsl.FlickerBuilder
|
||||||
import com.android.server.wm.flicker.dsl.runWithFlicker
|
import com.android.server.wm.flicker.dsl.runWithFlicker
|
||||||
@@ -113,6 +114,7 @@ class RotateTwoLaunchedAppTest(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@FlakyTest(bugId = 173875043)
|
||||||
@Test
|
@Test
|
||||||
fun testRotateAndEnterSplitScreenMode() {
|
fun testRotateAndEnterSplitScreenMode() {
|
||||||
val testTag = "testRotateAndEnterSplitScreenMode"
|
val testTag = "testRotateAndEnterSplitScreenMode"
|
||||||
|
|||||||
Reference in New Issue
Block a user