Skip to content

Commit

Permalink
Revert of Disable failing tests on Mac 10.10 Release (ATI) (patchset c…
Browse files Browse the repository at this point in the history
…hromium#1 id:1 of https://codereview.chromium.org/1456863003/ )

Reason for revert:
Per research and discussion on http://crbug.com/557929, we are pretty sure the bot is to blame and NOT the CLs or these tests.

Original issue's description:
> Disable failing tests on Mac 10.10 Release (ATI)
>
> Failing tests on Mac OS:
>   CastStreamingApiTestWithPixelOutput.EndToEnd
>   TabCaptureApiPixelTest.EndToEndThroughWebRTC
>   TabCaptureApiPixelTest.EndToEndWithoutRemoting
>
> BUG=557929
> TBR=hubbe@chromium.org, miu@chromium.org
>
> Committed: https://crrev.com/872e59f9875efaad8b73b44cf2707c0a57d52244
> Cr-Commit-Position: refs/heads/master@{#360460}

TBR=hubbe@chromium.org,hcarmona@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=557929

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

Cr-Commit-Position: refs/heads/master@{#360634}
  • Loading branch information
miu-chromium authored and Commit bot committed Nov 19, 2015
1 parent 1b42831 commit e13dcf9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,7 @@ class CastStreamingApiTestWithPixelOutput : public CastStreamingApiTest {
//
// TODO(miu): Now that this test has been long-stable on Release build bots, it
// should be enabled for the Debug build bots. http://crbug.com/396413
// Disabled in MacOS: https://crbug.com/557929
#if defined(NDEBUG) && !defined(OS_MACOSX)
#if defined(NDEBUG)
#define MAYBE_EndToEnd EndToEnd
#else
#define MAYBE_EndToEnd DISABLED_EndToEnd
Expand Down
16 changes: 2 additions & 14 deletions chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,7 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MaxOffscreenTabs) {
}

// Tests that tab capture video frames can be received in a VIDEO element.
// Disabled in MacOS: https://crbug.com/557929
#if defined(OS_MACOSX)
#define MAYBE_EndToEndWithoutRemoting DISABLED_EndToEndWithoutRemoting
#else
#define MAYBE_EndToEndWithoutRemoting EndToEndWithoutRemoting
#endif
IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEndWithoutRemoting) {
IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndWithoutRemoting) {
if (IsTooIntensiveForThisPlatform()) {
LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build.";
return;
Expand All @@ -195,13 +189,7 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEndWithoutRemoting) {
// received in a VIDEO element. More allowance is provided for color deviation
// because of the additional layers of video processing performed within
// WebRTC.
// Disabled in MacOS: https://crbug.com/557929
#if defined(OS_MACOSX)
#define MAYBE_EndToEndThroughWebRTC DISABLED_EndToEndThroughWebRTC
#else
#define MAYBE_EndToEndThroughWebRTC EndToEndThroughWebRTC
#endif
IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEndThroughWebRTC) {
IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndThroughWebRTC) {
if (IsTooIntensiveForThisPlatform()) {
LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build.";
return;
Expand Down

0 comments on commit e13dcf9

Please sign in to comment.