zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Disabling VideoCaptureTest on Linux."

Browse Source 
This reverts commit 183f4d90bd4f9c3fe5462f78138e657e43954bf5.

Reason for revert: This does not mitigate the bot's flakiness

Original change's description:
> Disabling VideoCaptureTest on Linux.
> 
> Has been really flaky lately, due to NumberOfDevices returning 0.
> 
> TBR=perkj@webrtc.org
> NOTRY=True
> 
> Bug: webrtc:9292
> Change-Id: I5a74236559f13bb6316abced5c12e5d276c398d6
> Reviewed-on: https://webrtc-review.googlesource.com/79680
> Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org>
> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#23436}

Bug: webrtc:9292
Change-Id: Id015ec431547f70c335c8e296f8b0a54ff5f4ca1
Reviewed-on: https://webrtc-review.googlesource.com/80381
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23505}
This commit is contained in:
Oleh Prypin
2018-06-01 06:59:31 +00:00
committed by Commit Bot
parent 358f2e0760
commit eed5faefb9
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/video_capture/test/video_capture_unittest.cc
View File

@ -190,10 +190,9 @@ class VideoCaptureTest : public testing::Test {
unsigned int number_of_devices_;
};
#ifdef WEBRTC_MAC
// Currently fails on Mac 64-bit, see
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406
// And flaky on Linux, see bugs.webrtc.org/9292.
#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
#define MAYBE_CreateDelete DISABLED_CreateDelete
#else
#define MAYBE_CreateDelete CreateDelete
@ -233,10 +232,9 @@ TEST_F(VideoCaptureTest, MAYBE_CreateDelete) {
}
}
#ifdef WEBRTC_MAC
// Currently fails on Mac 64-bit, see
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406
// And flaky on Linux, see bugs.webrtc.org/9292.
#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
#define MAYBE_Capabilities DISABLED_Capabilities
#else
#define MAYBE_Capabilities Capabilities