Commit 908b70ae authored by Tina Wang's avatar Tina Wang Committed by Commit Bot

Disable flaky tests on Linux

The test became flaky recently. See bug for details.

TBR=guidou@chromium.org

Bug: 986470
Change-Id: Ibab83e4393ba8e305340b21d01e2716dd4afb07c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713366
Commit-Queue: Tina Wang <tinazwang@chromium.org>
Reviewed-by: default avatarTina Wang <tinazwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#679803}
parent 5622ecf7
...@@ -39,6 +39,15 @@ namespace content { ...@@ -39,6 +39,15 @@ namespace content {
#define MAYBE_ManipulateExposureTime ManipulateExposureTime #define MAYBE_ManipulateExposureTime ManipulateExposureTime
#endif #endif
#if defined(OS_LINUX)
// See crbug/986470
#define MAYBE_GetPhotoSettings DISABLED_GetPhotoSettings
#define MAYBE_GetTrackSettings DISABLED_GetTrackSettings
#else
#define MAYBE_GetPhotoSettings GetPhotoSettings
#define MAYBE_GetTrackSettings GetTrackSettings
#endif
namespace { namespace {
static const char kImageCaptureHtmlFile[] = "/media/image_capture_test.html"; static const char kImageCaptureHtmlFile[] = "/media/image_capture_test.html";
...@@ -177,7 +186,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest, ...@@ -177,7 +186,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest,
} }
IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest, IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest,
GetPhotoSettings) { MAYBE_GetPhotoSettings) {
embedded_test_server()->StartAcceptingConnections(); embedded_test_server()->StartAcceptingConnections();
ASSERT_TRUE( ASSERT_TRUE(
RunImageCaptureTestCase("testCreateAndGetPhotoSettingsSucceeds()")); RunImageCaptureTestCase("testCreateAndGetPhotoSettingsSucceeds()"));
...@@ -200,7 +209,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest, ...@@ -200,7 +209,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest,
} }
IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest, IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest,
GetTrackSettings) { MAYBE_GetTrackSettings) {
embedded_test_server()->StartAcceptingConnections(); embedded_test_server()->StartAcceptingConnections();
ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndGetTrackSettings()")); ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndGetTrackSettings()"));
} }
......
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