admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Disable VideoCaptureTest due to flakyness"

Browse Source 
This reverts commit 4ee5e5f294dcd342851bbe80004ddd661fc6f3ed.

Reason for revert: HW fixed (hopefully)

Original change's description:
> Disable VideoCaptureTest due to flakyness
>
> Bug: webrtc:15229
> Change-Id: I3303b13be74d9eae5c52ecb2b920c23ac7d063d4
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/308220
> Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Björn Terelius <terelius@webrtc.org>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#40244}

Bug: webrtc:15229
Change-Id: I30ad37236ffcb56d7ffe4d3efa3d03705be25c47
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/311804
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40437}
This commit is contained in:
Björn Terelius 2023-07-17 08:27:15 +00:00 committed by WebRTC LUCI CQ
parent 726992d7a4
commit fd5bdca28c
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,10 +191,9 @@ class VideoCaptureTest : public ::testing::Test {
unsigned int number_of_devices_;
};
#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
#ifdef WEBRTC_MAC
// Currently fails on Mac 64-bit, see
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406
#define MAYBE_CreateDelete DISABLED_CreateDelete
#else
#define MAYBE_CreateDelete CreateDelete
@ -234,10 +233,9 @@ TEST_F(VideoCaptureTest, MAYBE_CreateDelete) {
}
}
#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
#ifdef WEBRTC_MAC
// Currently fails on Mac 64-bit, see
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406
#define MAYBE_Capabilities DISABLED_Capabilities
#else
#define MAYBE_Capabilities Capabilities
@ -344,10 +342,8 @@ TEST_F(VideoCaptureTest, DISABLED_TestTwoCameras) {
EXPECT_EQ(0, module1->StopCapture());
}
#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
#ifdef WEBRTC_MAC
// 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