Commit 08d36043 authored by Wei-Yin Chen (陳威尹)'s avatar Wei-Yin Chen (陳威尹) Committed by Commit Bot

Skip animation tests in StartSurfaceLayoutTest on KitKat

These animation tests too flaky on KitKat bots.

Bug: 991706, 981409, 981341
Change-Id: I7673786f0886abedb2450df9137e856286c667ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1743229Reviewed-by: default avatarYusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685280}
parent 85c969dd
......@@ -14,6 +14,7 @@ import static org.chromium.content_public.browser.test.util.CriteriaHelper.DEFAU
import static org.chromium.content_public.browser.test.util.CriteriaHelper.DEFAULT_POLLING_INTERVAL;
import android.graphics.Bitmap;
import android.os.Build;
import android.provider.Settings;
import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
......@@ -37,6 +38,7 @@ import org.chromium.base.GarbageCollectionTestUtils;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.ChromeSwitches;
......@@ -130,6 +132,7 @@ public class StartSurfaceLayoutTest {
// clang-format off
@Features.EnableFeatures(ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study")
@CommandLineFlags.Add({BASE_PARAMS})
@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
public void testTabToGridFromLiveTabAnimation() throws InterruptedException {
// clang-format on
assertTrue(FeatureUtilities.isTabToGtsAnimationEnabled());
......@@ -157,6 +160,7 @@ public class StartSurfaceLayoutTest {
// clang-format off
@Features.EnableFeatures(ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study")
@CommandLineFlags.Add({BASE_PARAMS + "/soft-cleanup-delay/10000/cleanup-delay/10000"})
@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
public void testTabToGridFromLiveTabWarmAnimation() throws InterruptedException {
// clang-format on
prepareTabs(2, NTP_URL);
......@@ -344,7 +348,7 @@ public class StartSurfaceLayoutTest {
@Test
@MediumTest
@Features.EnableFeatures(ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study")
@DisabledTest(message = "crbug.com/981409")
@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
public void testGridToTabToCurrentLiveWithAnimation() throws InterruptedException {
prepareTabs(1, mUrl);
testGridToTab(false, false);
......@@ -360,7 +364,7 @@ public class StartSurfaceLayoutTest {
@Test
@MediumTest
@Features.EnableFeatures(ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study")
@DisabledTest(message = "crbug.com/981341")
@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
public void testGridToTabToOtherLiveWithAnimation() throws InterruptedException {
prepareTabs(2, mUrl);
testGridToTab(true, false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment