Commit 7132643d authored by Donn Denman's avatar Donn Denman Committed by Commit Bot

[ToolTip] Disable a test on M+.

TBR=twellington@chromium.org

BUG=990135

Change-Id: Id7207b3f8e98f545d38d6404bb5f0a6e5cab905c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1732158Reviewed-by: default avatarDonn Denman <donnd@chromium.org>
Commit-Queue: Donn Denman <donnd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683436}
parent 912fb9c0
...@@ -14,6 +14,7 @@ import static com.google.android.libraries.feed.basicstream.internal.viewholders ...@@ -14,6 +14,7 @@ import static com.google.android.libraries.feed.basicstream.internal.viewholders
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
import android.os.Build;
import android.support.test.espresso.contrib.RecyclerViewActions; import android.support.test.espresso.contrib.RecyclerViewActions;
import android.support.test.espresso.matcher.RootMatchers; import android.support.test.espresso.matcher.RootMatchers;
import android.support.test.filters.MediumTest; import android.support.test.filters.MediumTest;
...@@ -30,6 +31,7 @@ import org.junit.runner.RunWith; ...@@ -30,6 +31,7 @@ import org.junit.runner.RunWith;
import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CallbackHelper;
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.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.ChromeSwitches;
...@@ -110,6 +112,8 @@ public class FeedTooltipTest { ...@@ -110,6 +112,8 @@ public class FeedTooltipTest {
@Test @Test
@MediumTest @MediumTest
@DisableIf.
Build(sdk_is_greater_than = Build.VERSION_CODES.LOLLIPOP, message = "crbug.com/990135")
@Feature({"FeedNewTabPage"}) @Feature({"FeedNewTabPage"})
public void testShowTooltip() throws Exception { public void testShowTooltip() throws Exception {
int callCount = mTestObserver.firstCardShownCallback.getCallCount(); int callCount = mTestObserver.firstCardShownCallback.getCallCount();
......
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