Commit 12d31e7d authored by Charlene Yan's avatar Charlene Yan Committed by Commit Bot

Sheriff: Disable flakey tests on cros.

MediaRouterIntegrationOneUABrowserTest.Basic
MediaRouterIntegrationOneUABrowserTest.ReconnectSessionSameTab

TBR=takumif@chromium.org

Bug: 822231, 1119958
Change-Id: I2a14c52e5cd5ba737c6710aa36e25318f9fdaffd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367781Reviewed-by: default avatarCharlene Yan <cyan@chromium.org>
Commit-Queue: Charlene Yan <cyan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800342}
parent 0045b0be
...@@ -43,7 +43,13 @@ class MediaRouterIntegrationOneUABrowserTest ...@@ -43,7 +43,13 @@ class MediaRouterIntegrationOneUABrowserTest
} }
}; };
IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest, Basic) { // TODO(https://crbug.com/822231): Flaky in Chromium waterfall.
#if defined(OS_CHROMEOS)
#define MAYBE_Basic DISABLED_Basic
#else
#define MAYBE_Basic Basic
#endif
IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest, MAYBE_Basic) {
RunBasicTest(); RunBasicTest();
} }
...@@ -65,7 +71,6 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest, ...@@ -65,7 +71,6 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
Fail_SendMessage) { Fail_SendMessage) {
RunFailToSendMessageTest(); RunFailToSendMessageTest();
} }
#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
(BUILDFLAG(CFI_CAST_CHECK) || BUILDFLAG(CFI_ICALL_CHECK) || \ (BUILDFLAG(CFI_CAST_CHECK) || BUILDFLAG(CFI_ICALL_CHECK) || \
BUILDFLAG(CFI_ENFORCEMENT_TRAP) || BUILDFLAG(CFI_ENFORCEMENT_DIAGNOSTIC)) BUILDFLAG(CFI_ENFORCEMENT_TRAP) || BUILDFLAG(CFI_ENFORCEMENT_DIAGNOSTIC))
...@@ -80,8 +85,14 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest, ...@@ -80,8 +85,14 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
} }
#undef MAYBE_ReconnectSession #undef MAYBE_ReconnectSession
// TODO(https://crbug.com/822231): Flaky in Chromium waterfall.
#if defined(OS_CHROMEOS)
#define MAYBE_ReconnectSessionSameTab DISABLED_ReconnectSessionSameTab
#else
#define MAYBE_ReconnectSessionSameTab ReconnectSessionSameTab
#endif
IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest, IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
ReconnectSessionSameTab) { MAYBE_ReconnectSessionSameTab) {
RunReconnectSessionSameTabTest(); RunReconnectSessionSameTabTest();
} }
......
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