From 4ee5e5f294dcd342851bbe80004ddd661fc6f3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Thu, 8 Jun 2023 11:22:16 +0200 Subject: [PATCH] Disable VideoCaptureTest due to flakyness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:15229 Change-Id: I3303b13be74d9eae5c52ecb2b920c23ac7d063d4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/308220 Owners-Override: Mirko Bonadei Commit-Queue: Björn Terelius Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#40244} --- .../test/video_capture_unittest.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc index c8af222b57..f1142302a1 100644 --- a/modules/video_capture/test/video_capture_unittest.cc +++ b/modules/video_capture/test/video_capture_unittest.cc @@ -191,9 +191,10 @@ 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 +#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) +// Currently fails on Mac 64-bit and Linux rel, see +// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406 and +// https://bugs.chromium.org/p/webrtc/issues/detail?id=15229 #define MAYBE_CreateDelete DISABLED_CreateDelete #else #define MAYBE_CreateDelete CreateDelete @@ -233,9 +234,10 @@ 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 +#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) +// Currently fails on Mac 64-bit and Linux rel, see +// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406 and +// https://bugs.chromium.org/p/webrtc/issues/detail?id=15229 #define MAYBE_Capabilities DISABLED_Capabilities #else #define MAYBE_Capabilities Capabilities @@ -342,8 +344,10 @@ TEST_F(VideoCaptureTest, DISABLED_TestTwoCameras) { EXPECT_EQ(0, module1->StopCapture()); } -#ifdef WEBRTC_MAC +#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) // No VideoCaptureImpl on Mac. +// Currently fails on Mac Linux rel, see +// https://bugs.chromium.org/p/webrtc/issues/detail?id=15229 #define MAYBE_ConcurrentAccess DISABLED_ConcurrentAccess #else #define MAYBE_ConcurrentAccess ConcurrentAccess