From eed5faefb9ca56b80bf4a6ba32f201b732410c9c Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Fri, 1 Jun 2018 06:59:31 +0000 Subject: [PATCH] Revert "Disabling VideoCaptureTest on Linux." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 > Reviewed-by: Taylor Brandstetter > 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 Reviewed-by: Patrik Höglund Commit-Queue: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#23505} --- modules/video_capture/test/video_capture_unittest.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc index b6ec37dfc2..16330b616f 100644 --- a/modules/video_capture/test/video_capture_unittest.cc +++ b/modules/video_capture/test/video_capture_unittest.cc @@ -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