Commit be1257d9 authored by Alex Ilin's avatar Alex Ilin

Disable VR tests failing on Android K

The following tests are being disabled:
- VrBrowserCompositorViewHolderTest#testResizeWithCompositorViewHolderDetached
- VrBrowserTransitionTest#test2dtoVrShellNfcUnsupported
- VrBrowserTransitionTest#test2dtoVrShellto2dUnsupported
- WebXrVrDeviceTest#testGvrlessMagicWindowCapabilities__ChromeTabbedActivity
- WebXrVrDeviceTest#testGvrlessMagicWindowCapabilities__CustomTabActivity
- WebXrVrDeviceTest#testGvrlessMagicWindowCapabilities__WebappActivity

TBR: bsheedy@chromium.org
Bug: 984943
Change-Id: If391b8cd7f66d7f3ca81e2081f21e0e2096c724d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1706437Reviewed-by: default avatarAlex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678284}
parent 37f873f6
......@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.vr;
import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_SVR;
import android.os.Build;
import android.support.test.filters.MediumTest;
import android.view.ViewGroup;
......@@ -15,6 +16,7 @@ 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.Restriction;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeSwitches;
......@@ -48,6 +50,8 @@ public class VrBrowserCompositorViewHolderTest {
*/
@Test
@MediumTest
@DisableIf.
Build(sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP, message = "https://crbug.com/984943")
public void testResizeWithCompositorViewHolderDetached()
throws InterruptedException, TimeoutException {
final AtomicInteger oldWidth = new AtomicInteger();
......
......@@ -16,6 +16,7 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.PointF;
import android.os.Build;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.support.test.filters.MediumTest;
......@@ -29,6 +30,7 @@ import org.junit.runner.RunWith;
import org.chromium.base.StrictModeContext;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeSwitches;
......@@ -127,6 +129,8 @@ public class VrBrowserTransitionTest {
@Test
@Restriction(RESTRICTION_TYPE_DEVICE_NON_DAYDREAM)
@MediumTest
@DisableIf.
Build(sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP, message = "https://crbug.com/984943")
public void test2dtoVrShellNfcUnsupported() {
enterVrShellNfc(false /* supported */);
}
......@@ -194,6 +198,8 @@ public class VrBrowserTransitionTest {
@Test
@Restriction(RESTRICTION_TYPE_DEVICE_NON_DAYDREAM)
@MediumTest
@DisableIf.
Build(sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP, message = "https://crbug.com/984943")
public void test2dtoVrShellto2dUnsupported() {
enterExitVrShell(false /* supported */);
}
......
......@@ -25,6 +25,7 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
import org.chromium.base.test.params.ParameterSet;
import org.chromium.base.test.params.ParameterizedRunner;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeSwitches;
......@@ -95,6 +96,8 @@ public class WebXrVrDeviceTest {
@MediumTest
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
@Restriction(RESTRICTION_TYPE_SVR)
@DisableIf.
Build(sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP, message = "https://crbug.com/984943")
// Sensorless still works on older devices since it doesn't rely on anything in the DFM.
public void testGvrlessMagicWindowCapabilities() throws InterruptedException {
// Make Chrome think that VrCore is not installed
......
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