Merge "Disable tests flaky on flame" into sc-dev

This commit is contained in:
Nataniel Borges
2021-01-29 18:18:15 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 0 deletions

View File

@@ -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"

View File

@@ -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"