Skip to content

GitLab

T
tangled
Commit 28c21fa4 authored by bsheedy's avatar bsheedy Committed by Commit Bot
Browse files
Options

Re-enable disabled VR tests 

Re-enables all the VR tests that were marked as flaky now that the
root cause has been reverted.

TBR=mthiesse@chromium.org

Bug: 894796
Change-Id: I34c4b8e10edec2e682c450b1b18c2428f3e29473
Reviewed-on: https://chromium-review.googlesource.com/c/1305211Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603594}
parent 63debc65
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 26 deletions
chrome/android/javatests/src/org/chromium/chrome/browser/vr/WebXrVrDeviceTest.java
View file @ 28c21fa4
...@@ -22,7 +22,6 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate; ...@@ -22,7 +22,6 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
import org.chromium.base.test.params.ParameterSet; import org.chromium.base.test.params.ParameterSet;
import org.chromium.base.test.params.ParameterizedRunner; import org.chromium.base.test.params.ParameterizedRunner;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.FlakyTest;
import org.chromium.base.test.util.MinAndroidSdkLevel; import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.ChromeSwitches;
...@@ -71,7 +70,6 @@ public class WebXrVrDeviceTest { ...@@ -71,7 +70,6 @@ public class WebXrVrDeviceTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
public void testDeviceCapabilitiesMatchExpectations() throws InterruptedException { public void testDeviceCapabilitiesMatchExpectations() throws InterruptedException {
mWebVrTestFramework.loadUrlAndAwaitInitialization( mWebVrTestFramework.loadUrlAndAwaitInitialization(
...@@ -89,7 +87,6 @@ public class WebXrVrDeviceTest { ...@@ -89,7 +87,6 @@ public class WebXrVrDeviceTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags.Add("enable-features=WebXROrientationSensorDevice") @CommandLineFlags.Add("enable-features=WebXROrientationSensorDevice")
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
@Restriction(RESTRICTION_TYPE_SVR) @Restriction(RESTRICTION_TYPE_SVR)
...@@ -113,7 +110,6 @@ public class WebXrVrDeviceTest { ...@@ -113,7 +110,6 @@ public class WebXrVrDeviceTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
@CommandLineFlags.Add({"enable-features=WebXR"}) @CommandLineFlags.Add({"enable-features=WebXR"})
......
chrome/android/javatests/src/org/chromium/chrome/browser/vr/WebXrVrInputTest.java
View file @ 28c21fa4
...@@ -34,7 +34,6 @@ import org.chromium.base.test.params.ParameterizedRunner; ...@@ -34,7 +34,6 @@ import org.chromium.base.test.params.ParameterizedRunner;
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.DisableIf;
import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.FlakyTest;
import org.chromium.base.test.util.MinAndroidSdkLevel; import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.ChromeSwitches;
...@@ -97,7 +96,6 @@ public class WebXrVrInputTest { ...@@ -97,7 +96,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@DisableIf. @DisableIf.
Build(message = "Flaky on K/L crbug.com/762126", sdk_is_less_than = Build.VERSION_CODES.M) Build(message = "Flaky on K/L crbug.com/762126", sdk_is_less_than = Build.VERSION_CODES.M)
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
...@@ -112,7 +110,6 @@ public class WebXrVrInputTest { ...@@ -112,7 +110,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@DisableIf @DisableIf
.Build(message = "Flaky on K/L crbug.com/762126", .Build(message = "Flaky on K/L crbug.com/762126",
sdk_is_less_than = Build.VERSION_CODES.M) sdk_is_less_than = Build.VERSION_CODES.M)
...@@ -261,7 +258,6 @@ public class WebXrVrInputTest { ...@@ -261,7 +258,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM) @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
public void testScreenTapsRegisteredOnCardboard() throws InterruptedException { public void testScreenTapsRegisteredOnCardboard() throws InterruptedException {
...@@ -292,7 +288,6 @@ public class WebXrVrInputTest { ...@@ -292,7 +288,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM) @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
...@@ -332,7 +327,6 @@ public class WebXrVrInputTest { ...@@ -332,7 +327,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
public void testPresentationLocksFocus() throws InterruptedException { public void testPresentationLocksFocus() throws InterruptedException {
presentationLocksFocusImpl( presentationLocksFocusImpl(
...@@ -346,7 +340,6 @@ public class WebXrVrInputTest { ...@@ -346,7 +340,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
@CommandLineFlags.Add({"enable-features=WebXR"}) @CommandLineFlags.Add({"enable-features=WebXR"})
...@@ -571,7 +564,6 @@ public class WebXrVrInputTest { ...@@ -571,7 +564,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE) @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
...@@ -590,7 +582,6 @@ public class WebXrVrInputTest { ...@@ -590,7 +582,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM) @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
...@@ -608,7 +599,6 @@ public class WebXrVrInputTest { ...@@ -608,7 +599,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE) @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
...@@ -625,7 +615,6 @@ public class WebXrVrInputTest { ...@@ -625,7 +615,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM) @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
...@@ -644,7 +633,6 @@ public class WebXrVrInputTest { ...@@ -644,7 +633,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE) @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
@CommandLineFlags.Remove({"enable-webvr"}) @CommandLineFlags.Remove({"enable-webvr"})
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
...@@ -659,7 +647,6 @@ public class WebXrVrInputTest { ...@@ -659,7 +647,6 @@ public class WebXrVrInputTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM) @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
@CommandLineFlags.Remove({"enable-webvr"}) @CommandLineFlags.Remove({"enable-webvr"})
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
......
chrome/android/javatests/src/org/chromium/chrome/browser/vr/WebXrVrTransitionTest.java
View file @ 28c21fa4
...@@ -37,7 +37,6 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate; ...@@ -37,7 +37,6 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
import org.chromium.base.test.params.ParameterSet; import org.chromium.base.test.params.ParameterSet;
import org.chromium.base.test.params.ParameterizedRunner; import org.chromium.base.test.params.ParameterizedRunner;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.FlakyTest;
import org.chromium.base.test.util.MinAndroidSdkLevel; import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.ChromeActivity;
...@@ -94,7 +93,6 @@ public class WebXrVrTransitionTest { ...@@ -94,7 +93,6 @@ public class WebXrVrTransitionTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
public void testRequestPresentEntersVr() throws InterruptedException { public void testRequestPresentEntersVr() throws InterruptedException {
testPresentationEntryImpl( testPresentationEntryImpl(
...@@ -107,7 +105,6 @@ public class WebXrVrTransitionTest { ...@@ -107,7 +105,6 @@ public class WebXrVrTransitionTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
@CommandLineFlags.Add({"enable-features=WebXR"}) @CommandLineFlags.Add({"enable-features=WebXR"})
...@@ -165,7 +162,6 @@ public class WebXrVrTransitionTest { ...@@ -165,7 +162,6 @@ public class WebXrVrTransitionTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags.Remove({"enable-webvr"}) @CommandLineFlags.Remove({"enable-webvr"})
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
public void testWebVrDisabledWithoutFlagSet() throws InterruptedException { public void testWebVrDisabledWithoutFlagSet() throws InterruptedException {
...@@ -182,7 +178,6 @@ public class WebXrVrTransitionTest { ...@@ -182,7 +178,6 @@ public class WebXrVrTransitionTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags.Remove({"enable-webvr"}) @CommandLineFlags.Remove({"enable-webvr"})
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
public void testWebXrDisabledWithoutFlagSet() throws InterruptedException { public void testWebXrDisabledWithoutFlagSet() throws InterruptedException {
...@@ -370,7 +365,6 @@ public class WebXrVrTransitionTest { ...@@ -370,7 +365,6 @@ public class WebXrVrTransitionTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL}) @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
public void testWindowRafStopsFiringWhilePresenting() throws InterruptedException { public void testWindowRafStopsFiringWhilePresenting() throws InterruptedException {
windowRafStopsFiringWhilePresentingImpl( windowRafStopsFiringWhilePresentingImpl(
...@@ -385,7 +379,6 @@ public class WebXrVrTransitionTest { ...@@ -385,7 +379,6 @@ public class WebXrVrTransitionTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
@CommandLineFlags.Add({"enable-features=WebXR"}) @CommandLineFlags.Add({"enable-features=WebXR"})
...@@ -457,7 +450,6 @@ public class WebXrVrTransitionTest { ...@@ -457,7 +450,6 @@ public class WebXrVrTransitionTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
@CommandLineFlags.Add({"enable-features=WebXR"}) @CommandLineFlags.Add({"enable-features=WebXR"})
...@@ -477,7 +469,6 @@ public class WebXrVrTransitionTest { ...@@ -477,7 +469,6 @@ public class WebXrVrTransitionTest {
*/ */
@Test @Test
@MediumTest @MediumTest
@FlakyTest(message = "https://crbug.com/894796")
@CommandLineFlags @CommandLineFlags
.Remove({"enable-webvr"}) .Remove({"enable-webvr"})
@CommandLineFlags.Add({"enable-features=WebXR"}) @CommandLineFlags.Add({"enable-features=WebXR"})
......
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