Commit 79bc8501 authored by Tim Volodine's avatar Tim Volodine Committed by Commit Bot

[WebLayer] Disable failing MediaCaptureTests on L/M Tablets

Disable failing MediaCapture tests on Lollipop and
Marshmallow Tablet Tester bots.

Tests:
MediaCaptureTest#testMediaCapture_basic
MediaCaptureTest#testMediaCapture_rememberPermission
MediaCaptureTest#testMediaCapture_twoStreams
MediaCaptureTest#testMediaCapture_twoStreamsNotification

Also adds a dependency on //ui/android:ui_java_test_support
for the weblayer_private_java_tests test target.

BUG=1107380
TBR=estade@chromium.org

Change-Id: Id682278331e379d7165f3a9801353977faae8185
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2306043Reviewed-by: default avatarTim Volodine <timvolodine@chromium.org>
Commit-Queue: Tim Volodine <timvolodine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789908}
parent 66c685c3
......@@ -88,6 +88,7 @@ android_library("weblayer_private_java_tests") {
"//third_party/android_support_test_runner:runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//ui/android:ui_java_test_support",
"//weblayer/public/java",
"//weblayer/public/javatestutil:test_java",
"//weblayer/shell/android:weblayer_shell_java",
......
......@@ -23,10 +23,12 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.content_public.browser.test.util.Criteria;
import org.chromium.content_public.browser.test.util.CriteriaHelper;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.test.util.UiDisableIf;
import org.chromium.weblayer.MediaCaptureCallback;
import org.chromium.weblayer.TestWebLayer;
import org.chromium.weblayer.shell.InstrumentationActivity;
......@@ -86,6 +88,7 @@ public final class MediaCaptureTest {
*/
@Test
@MediumTest
@DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1107380
public void testMediaCapture_basic() throws Throwable {
mActivityTestRule.navigateAndWait(
mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia.html"));
......@@ -115,6 +118,7 @@ public final class MediaCaptureTest {
*/
@Test
@MediumTest
@DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1107380
public void testMediaCapture_rememberPermission() throws Throwable {
mActivityTestRule.navigateAndWait(
mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia.html"));
......@@ -144,6 +148,7 @@ public final class MediaCaptureTest {
*/
@Test
@MediumTest
@DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1107380
public void testMediaCapture_twoStreams() throws Throwable {
mActivityTestRule.navigateAndWait(
mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia2.html"));
......@@ -172,6 +177,7 @@ public final class MediaCaptureTest {
@Test
@MediumTest
@MinAndroidSdkLevel(Build.VERSION_CODES.M)
@DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1107380
public void testMediaCapture_twoStreamsNotification() throws Throwable {
mActivityTestRule.navigateAndWait(
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