Commit 07713588 authored by zmo's avatar zmo Committed by Commit bot

Skip TwoGetUserMediaWithEqualConstraints on win debug

It is flaky on win7 (dbg) on webkit waterfall

BUG=417756
TEST=bots
TBR=phoglund@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/602233002

Cr-Commit-Position: refs/heads/master@{#296782}
parent 24cc138c
...@@ -439,8 +439,16 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) { ...@@ -439,8 +439,16 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
"twoGetUserMediaAndStop({video: true, audio: true});"); "twoGetUserMediaAndStop({video: true, audio: true});");
} }
#if defined(OS_WIN) && !defined(NDEBUG)
// Flaky on Webkit Win7 Debug bot: http://crbug.com/417756
#define MAYBE_TwoGetUserMediaWithEqualConstraints \
DISABLED_TwoGetUserMediaWithEqualConstraints
#else
#define MAYBE_TwoGetUserMediaWithEqualConstraints \
TwoGetUserMediaWithEqualConstraints
#endif
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TwoGetUserMediaWithEqualConstraints) { MAYBE_TwoGetUserMediaWithEqualConstraints) {
std::string constraints1 = "{video: true, audio: true}"; std::string constraints1 = "{video: true, audio: true}";
const std::string& constraints2 = constraints1; const std::string& constraints2 = constraints1;
std::string expected_result = "w=640:h=480-w=640:h=480"; std::string expected_result = "w=640:h=480-w=640:h=480";
...@@ -466,7 +474,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, ...@@ -466,7 +474,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
#define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
TwoGetUserMediaWithFirstHdSecondVga TwoGetUserMediaWithFirstHdSecondVga
#endif #endif
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
MAYBE_TwoGetUserMediaWithFirstHdSecondVga) { MAYBE_TwoGetUserMediaWithFirstHdSecondVga) {
std::string constraints1 = std::string constraints1 =
......
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