Commit 628aa287 authored by Alex Ilin's avatar Alex Ilin Committed by Commit Bot

WebLayer: disable failing MediaCaptureTests

MediaCaptureTest#twoStreams and MediaCaptureTest#twoStreamsNotification
are still flaky on Lollipop Tablet Tester and Marshmallow Tablet Tester

TBR=sky@chromium.org,estade@chromium.org

Bug: 1107380
Change-Id: I4f875f32d4d3de74ab99b225e4ee78a2637a955f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2555337
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Reviewed-by: default avatarAlex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830227}
parent 4966c118
...@@ -25,6 +25,7 @@ import org.junit.runner.RunWith; ...@@ -25,6 +25,7 @@ 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.Criteria; import org.chromium.base.test.util.Criteria;
import org.chromium.base.test.util.CriteriaHelper; import org.chromium.base.test.util.CriteriaHelper;
import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.MinAndroidSdkLevel; import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.weblayer.MediaCaptureCallback; import org.chromium.weblayer.MediaCaptureCallback;
...@@ -144,6 +145,8 @@ public final class MediaCaptureTest { ...@@ -144,6 +145,8 @@ public final class MediaCaptureTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@DisableIf.Build(sdk_is_greater_than = 20, sdk_is_less_than = 24,
message = "Failing on {Lollipop,Marshmallow} Tablet Tester. https://crbug.com/1107380")
public void twoStreams() throws Throwable { public void twoStreams() throws Throwable {
mActivityTestRule.navigateAndWait( mActivityTestRule.navigateAndWait(
mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia2.html")); mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia2.html"));
...@@ -172,6 +175,8 @@ public final class MediaCaptureTest { ...@@ -172,6 +175,8 @@ public final class MediaCaptureTest {
@Test @Test
@MediumTest @MediumTest
@MinAndroidSdkLevel(Build.VERSION_CODES.M) @MinAndroidSdkLevel(Build.VERSION_CODES.M)
@DisableIf.Build(sdk_is_greater_than = 20, sdk_is_less_than = 24,
message = "Failing on {Lollipop,Marshmallow} Tablet Tester. https://crbug.com/1107380")
public void twoStreamsNotification() throws Throwable { public void twoStreamsNotification() throws Throwable {
mActivityTestRule.navigateAndWait( mActivityTestRule.navigateAndWait(
mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia2.html")); mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia2.html"));
......
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