Commit 825a9342 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Disabling flaky AdaptiveToolbarTests on KitKat

Suspected culprit CL: https://crrev.com/c/2006485

TBR=lazzzis@google.com

Bug: 1046317, 1046316, 1045729
Change-Id: I44124aeb3d9729bda8eac714998a2ef24de9ad79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2026255Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736200}
parent 25aa35c6
......@@ -24,6 +24,7 @@ import static org.chromium.chrome.test.util.ToolbarTestUtils.checkToolbarVisibil
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.os.Build;
import android.support.test.filters.MediumTest;
import org.junit.After;
......@@ -128,8 +129,10 @@ public class AdaptiveToolbarTest {
@Test
@MediumTest
// clang-format off
@DisableIf.Build(message = "Flaky on KitKat: crbug.com/1046317",
sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP)
@CommandLineFlags.Add({"enable-features=" + ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID +
"<Study", "force-fieldtrials=Study/Group", NO_NEW_TAB_VARIATION_PARAMS})
"<Study", "force-fieldtrials=Study/Group", NO_NEW_TAB_VARIATION_PARAMS})
public void testTopToolbar_WithGTS_WithBottomToolbar_Home_Search_Tab_Switcher_IncognitoDisabled() {
// clang-format on
IncognitoUtils.setEnabledForTesting(false);
......@@ -167,6 +170,8 @@ public class AdaptiveToolbarTest {
@Test
@MediumTest
// clang-format off
@DisableIf.Build(message = "Flaky on KitKat: crbug.com/1046316",
sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP)
@CommandLineFlags.Add({"enable-features=" + ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID +
"<Study", "force-fieldtrials=Study/Group", NO_NEW_TAB_VARIATION_PARAMS})
public void testTopToolbar_WithGTS_WithBottomToolbar_Home_Search_Share() {
......@@ -287,7 +292,11 @@ public class AdaptiveToolbarTest {
@Test
@MediumTest
// clang-format off
@DisableIf.Build(message = "Flaky on KitKat: crbug.com/1045729",
sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP)
public void testTopToolbar_WithoutGTS_WithBottomToolbar_Home_Search_Share() {
// clang-format on
BottomToolbarVariationManager.setVariation(Variations.HOME_SEARCH_SHARE);
setupFlagsAndLaunchActivity(true, false);
final ChromeTabbedActivity cta = mActivityTestRule.getActivity();
......
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