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

Disable flaky ConditionalTabStripTest

Some tests in ConditionalTabStripTest fails on Lollipop Phone Tester.
Selectively disable them on L or below.

TBR=yuezhanggg@chromium.org

Bug: 1081832
Change-Id: I9a0b6d3ddc93f2386306361a0af75b5b41b83635
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2199269Reviewed-by: default avatarWei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768575}
parent c28aeacb
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package org.chromium.chrome.browser.tasks.tab_management; package org.chromium.chrome.browser.tasks.tab_management;
import static android.os.Build.VERSION_CODES.M;
import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.longClick; import static android.support.test.espresso.action.ViewActions.longClick;
...@@ -42,6 +43,7 @@ import org.junit.rules.TestRule; ...@@ -42,6 +43,7 @@ import org.junit.rules.TestRule;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.ChromeTabbedActivity;
...@@ -125,6 +127,7 @@ public class ConditionalTabStripTest { ...@@ -125,6 +127,7 @@ public class ConditionalTabStripTest {
@Test @Test
@MediumTest @MediumTest
@DisableIf.Build(sdk_is_less_than = M, message = "crbug.com/1081832")
public void testStrip_updateWithAddition() throws Exception { public void testStrip_updateWithAddition() throws Exception {
ChromeTabbedActivity cta = mActivityTestRule.getActivity(); ChromeTabbedActivity cta = mActivityTestRule.getActivity();
verifyHidingStrip(); verifyHidingStrip();
...@@ -195,6 +198,7 @@ public class ConditionalTabStripTest { ...@@ -195,6 +198,7 @@ public class ConditionalTabStripTest {
@Test @Test
@MediumTest @MediumTest
@DisableIf.Build(sdk_is_less_than = M, message = "crbug.com/1081832")
public void testStrip_updateWithSelection() throws Exception { public void testStrip_updateWithSelection() throws Exception {
ChromeTabbedActivity cta = mActivityTestRule.getActivity(); ChromeTabbedActivity cta = mActivityTestRule.getActivity();
verifyHidingStrip(); verifyHidingStrip();
...@@ -275,6 +279,7 @@ public class ConditionalTabStripTest { ...@@ -275,6 +279,7 @@ public class ConditionalTabStripTest {
@Test @Test
@MediumTest @MediumTest
@DisableIf.Build(sdk_is_less_than = M, message = "crbug.com/1081832")
public void testStrip_switchTabWithStrip() throws Exception { public void testStrip_switchTabWithStrip() throws Exception {
ChromeTabbedActivity cta = mActivityTestRule.getActivity(); ChromeTabbedActivity cta = mActivityTestRule.getActivity();
verifyHidingStrip(); verifyHidingStrip();
...@@ -292,6 +297,7 @@ public class ConditionalTabStripTest { ...@@ -292,6 +297,7 @@ public class ConditionalTabStripTest {
@Test @Test
@MediumTest @MediumTest
@DisableIf.Build(sdk_is_less_than = M, message = "crbug.com/1081832")
public void testStrip_closeTabWithStrip() throws Exception { public void testStrip_closeTabWithStrip() throws Exception {
ChromeTabbedActivity cta = mActivityTestRule.getActivity(); ChromeTabbedActivity cta = mActivityTestRule.getActivity();
verifyHidingStrip(); verifyHidingStrip();
......
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