Revert "[Video Capture, Test] Make tests requiring real webcam fail if it's not found"
This reverts commit dfeab488cdc95233b19b9edeedef3d0b7581b17e.
Reason for revert: Tests fail on Chromium WebRTC bots. Example: https://ci.chromium.org/buildbot/chromium.webrtc/Mac%20Tester/84091
Original change's description:
> [Video Capture, Test] Make tests requiring real webcam fail if it's not found
>
> Use prefix "UsingRealWebcam_" for names of tests that require real webcam and
> add checking whether webcam is found or not.
> Accordingly, exclude such test cases from test suites for devices that have no
> camera.
>
> Bug: 893494
> Test: Ran capture_unittests including UsingRealWebcam_ tests on Chromebox (guado)
> and it failed.
> Test: Ran capture_unittests excluding UsingRealWebcam_ tests on Chromebox (guado)
> and it passed.
> Test: Ran capture_unittests including UsingRealWebcam_ tests on Chromebook (kevin)
> and it passed.
>
> Change-Id: I5c91380b7674aeace6a7d1764f7fad31f02f8af7
> Reviewed-on: https://chromium-review.googlesource.com/c/1276407
> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
> Reviewed-by: Christian Fremerey <chfremer@chromium.org>
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#599097}
TBR=bpastene@chromium.org,chfremer@chromium.org,keiichiw@chromium.org
Change-Id: I282dc00ffad2ff6614e7dfab1a9404da85cf032a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 893494
Reviewed-on: https://chromium-review.googlesource.com/c/1278272
Reviewed-by: Henrik Grunell <grunell@chromium.org>
Commit-Queue: Henrik Grunell <grunell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599123}diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc
index f3d05c7..b322dbe 100644
--- a/media/capture/video/video_capture_device_unittest.cc
+++ b/media/capture/video/video_capture_device_unittest.cc
@@ -58,46 +58,42 @@
#if defined(OS_MACOSX)
// Mac will always give you the size you ask for and this case will fail.
-#define MAYBE_UsingRealWebcam_AllocateBadSize \
- DISABLED_UsingRealWebcam_AllocateBadSize
+#define MAYBE_AllocateBadSize DISABLED_AllocateBadSize
// We will always get YUYV from the Mac AVFoundation implementations.
-#define MAYBE_UsingRealWebcam_CaptureMjpeg DISABLED_UsingRealWebcam_CaptureMjpeg
-#define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
-#define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
+#define MAYBE_CaptureMjpeg DISABLED_CaptureMjpeg
+#define MAYBE_TakePhoto TakePhoto
+#define MAYBE_GetPhotoState GetPhotoState
#elif defined(OS_WIN)
-#define MAYBE_UsingRealWebcam_AllocateBadSize UsingRealWebcam_AllocateBadSize
-#define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
-#define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
-#define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
+#define MAYBE_AllocateBadSize AllocateBadSize
+#define MAYBE_CaptureMjpeg CaptureMjpeg
+#define MAYBE_TakePhoto TakePhoto
+#define MAYBE_GetPhotoState GetPhotoState
#elif defined(OS_ANDROID)
-#define MAYBE_UsingRealWebcam_AllocateBadSize UsingRealWebcam_AllocateBadSize
-#define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
-#define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
-#define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
-#define MAYBE_UsingRealWebcam_CaptureWithSize UsingRealWebcam_CaptureWithSize
+#define MAYBE_AllocateBadSize AllocateBadSize
+#define MAYBE_CaptureMjpeg CaptureMjpeg
+#define MAYBE_TakePhoto TakePhoto
+#define MAYBE_GetPhotoState GetPhotoState
+#define MAYBE_CaptureWithSize CaptureWithSize
#elif defined(OS_CHROMEOS)
-#define MAYBE_UsingRealWebcam_AllocateBadSize \
- DISABLED_UsingRealWebcam_AllocateBadSize
-#define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
-#define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
-#define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
-#define MAYBE_UsingRealWebcam_CaptureWithSize UsingRealWebcam_CaptureWithSize
+#define MAYBE_AllocateBadSize DISABLED_AllocateBadSize
+#define MAYBE_CaptureMjpeg CaptureMjpeg
+#define MAYBE_TakePhoto TakePhoto
+#define MAYBE_GetPhotoState GetPhotoState
+#define MAYBE_CaptureWithSize CaptureWithSize
#elif defined(OS_LINUX)
-// UsingRealWebcam_AllocateBadSize will hang when a real camera is attached and
-// if more than one test is trying to use the camera (even across processes). Do
-// NOT renable this test without fixing the many bugs associated with it:
+// AllocateBadSize will hang when a real camera is attached and if more than one
+// test is trying to use the camera (even across processes). Do NOT renable
+// this test without fixing the many bugs associated with it:
// http://crbug.com/94134 http://crbug.com/137260 http://crbug.com/417824
-#define MAYBE_UsingRealWebcam_AllocateBadSize \
- DISABLED_UsingRealWebcam_AllocateBadSize
-#define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
-#define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
-#define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
+#define MAYBE_AllocateBadSize DISABLED_AllocateBadSize
+#define MAYBE_CaptureMjpeg CaptureMjpeg
+#define MAYBE_TakePhoto TakePhoto
+#define MAYBE_GetPhotoState GetPhotoState
#else
-#define MAYBE_UsingRealWebcam_AllocateBadSize UsingRealWebcam_AllocateBadSize
-#define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
-#define MAYBE_UsingRealWebcam_TakePhoto DISABLED_UsingRealWebcam_TakePhoto
-#define MAYBE_UsingRealWebcam_GetPhotoState \
- DISABLED_UsingRealWebcam_GetPhotoState
+#define MAYBE_AllocateBadSize AllocateBadSize
+#define MAYBE_CaptureMjpeg CaptureMjpeg
+#define MAYBE_TakePhoto DISABLED_TakePhoto
+#define MAYBE_GetPhotoState DISABLED_GetPhotoState
#endif
// Wrap the TEST_P macro into another one to allow to preprocess |test_name|
@@ -498,14 +494,15 @@
}
// Allocates the first enumerated device, and expects a frame.
-WRAPPED_TEST_P(VideoCaptureDeviceTest, UsingRealWebcam_CaptureWithSize) {
+WRAPPED_TEST_P(VideoCaptureDeviceTest, CaptureWithSize) {
RunTestCase(
base::BindOnce(&VideoCaptureDeviceTest::RunCaptureWithSizeTestCase,
base::Unretained(this)));
}
void VideoCaptureDeviceTest::RunCaptureWithSizeTestCase() {
const auto descriptor = FindUsableDeviceDescriptor();
- ASSERT_TRUE(descriptor);
+ if (!descriptor)
+ return;
const gfx::Size& size = std::get<0>(GetParam());
if (!IsCaptureSizeSupported(*descriptor, size))
@@ -552,14 +549,15 @@
// Allocates a device with an uncommon resolution and verifies frames are
// captured in a close, much more typical one.
-WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_UsingRealWebcam_AllocateBadSize) {
+WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) {
RunTestCase(
base::BindOnce(&VideoCaptureDeviceTest::RunAllocateBadSizeTestCase,
base::Unretained(this)));
}
void VideoCaptureDeviceTest::RunAllocateBadSizeTestCase() {
const auto descriptor = FindUsableDeviceDescriptor();
- ASSERT_TRUE(descriptor);
+ if (!descriptor)
+ return;
std::unique_ptr<VideoCaptureDevice> device(
video_capture_device_factory_->CreateDevice(*descriptor));
@@ -583,15 +581,15 @@
}
// Cause hangs on Windows, Linux. Fails Android. https://crbug.com/417824
-WRAPPED_TEST_P(VideoCaptureDeviceTest,
- DISABLED_UsingRealWebcam_ReAllocateCamera) {
+WRAPPED_TEST_P(VideoCaptureDeviceTest, DISABLED_ReAllocateCamera) {
RunTestCase(
base::BindOnce(&VideoCaptureDeviceTest::RunReAllocateCameraTestCase,
base::Unretained(this)));
}
void VideoCaptureDeviceTest::RunReAllocateCameraTestCase() {
const auto descriptor = FindUsableDeviceDescriptor();
- ASSERT_TRUE(descriptor);
+ if (!descriptor)
+ return;
// First, do a number of very fast device start/stops.
for (int i = 0; i <= 5; i++) {
@@ -632,15 +630,17 @@
}
// Starts the camera in 720p to try and capture MJPEG format.
-WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_UsingRealWebcam_CaptureMjpeg) {
+WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_CaptureMjpeg) {
RunTestCase(base::BindOnce(&VideoCaptureDeviceTest::RunCaptureMjpegTestCase,
base::Unretained(this)));
}
void VideoCaptureDeviceTest::RunCaptureMjpegTestCase() {
std::unique_ptr<VideoCaptureDeviceDescriptor> device_descriptor =
GetFirstDeviceDescriptorSupportingPixelFormat(PIXEL_FORMAT_MJPEG);
- ASSERT_TRUE(device_descriptor);
-
+ if (!device_descriptor) {
+ DVLOG(1) << "No camera supports MJPEG format. Exiting test.";
+ return;
+ }
#if defined(OS_WIN)
base::win::Version version = base::win::GetVersion();
if (version >= base::win::VERSION_WIN10) {
@@ -688,13 +688,14 @@
// Starts the camera and verifies that a photo can be taken. The correctness of
// the photo is enforced by MockImageCaptureClient.
-WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_UsingRealWebcam_TakePhoto) {
+WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_TakePhoto) {
RunTestCase(base::BindOnce(&VideoCaptureDeviceTest::RunTakePhotoTestCase,
base::Unretained(this)));
}
void VideoCaptureDeviceTest::RunTakePhotoTestCase() {
const auto descriptor = FindUsableDeviceDescriptor();
- ASSERT_TRUE(descriptor);
+ if (!descriptor)
+ return;
const gfx::Size frame_size = GetSupportedCaptureSize(*descriptor);
if (frame_size == gfx::Size(0, 0))
@@ -737,13 +738,14 @@
}
// Starts the camera and verifies that the photo capabilities can be retrieved.
-WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_UsingRealWebcam_GetPhotoState) {
+WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_GetPhotoState) {
RunTestCase(base::BindOnce(&VideoCaptureDeviceTest::RunGetPhotoStateTestCase,
base::Unretained(this)));
}
void VideoCaptureDeviceTest::RunGetPhotoStateTestCase() {
const auto descriptor = FindUsableDeviceDescriptor();
- ASSERT_TRUE(descriptor);
+ if (!descriptor)
+ return;
const gfx::Size frame_size = GetSupportedCaptureSize(*descriptor);
if (frame_size == gfx::Size(0, 0))
@@ -793,14 +795,16 @@
#if defined(OS_WIN)
// Verifies that the photo callback is correctly released by MediaFoundation
-WRAPPED_TEST_P(VideoCaptureDeviceTest,
- UsingRealWebcam_CheckPhotoCallbackRelease) {
+WRAPPED_TEST_P(VideoCaptureDeviceTest, CheckPhotoCallbackRelease) {
if (!UseWinMediaFoundation())
return;
std::unique_ptr<VideoCaptureDeviceDescriptor> descriptor =
GetFirstDeviceDescriptorSupportingPixelFormat(PIXEL_FORMAT_MJPEG);
- ASSERT_TRUE(descriptor);
+ if (!descriptor) {
+ DVLOG(1) << "No usable media foundation device descriptor. Exiting test.";
+ return;
+ }
EXPECT_CALL(*video_capture_client_, OnError(_, _, _)).Times(0);
EXPECT_CALL(*video_capture_client_, OnStarted());
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index b442a81..02abef4 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -1164,7 +1164,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -3702,7 +3701,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -5245,7 +5243,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 976a887..c3dd504 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -1033,7 +1033,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -3686,7 +3685,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -6308,7 +6306,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -9073,7 +9070,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -11770,7 +11766,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -14425,7 +14420,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -18557,7 +18551,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -21234,7 +21227,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 1f86db3..1ec73b2 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -50,8 +50,7 @@
},
{
"args": [
- "--test-launcher-jobs=1",
- "--gtest_filter=-*UsingRealWebcam*"
+ "--test-launcher-jobs=1"
],
"swarming": {
"can_use_on_swarming_builders": true,
@@ -553,9 +552,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -1258,9 +1254,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
diff --git a/testing/buildbot/chromium.clang.json b/testing/buildbot/chromium.clang.json
index 811d0e3..e0913e9 100644
--- a/testing/buildbot/chromium.clang.json
+++ b/testing/buildbot/chromium.clang.json
@@ -107,9 +107,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -790,9 +787,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -1954,9 +1948,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -3106,9 +3097,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -4195,9 +4183,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -5116,7 +5101,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -7821,7 +7805,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -10139,9 +10122,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -10785,7 +10765,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
@@ -11560,9 +11539,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -12144,9 +12120,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -12737,9 +12710,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -13315,9 +13285,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -13988,7 +13955,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
@@ -14687,9 +14653,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -15352,9 +15315,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -16017,9 +15977,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -16682,9 +16639,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -17347,9 +17301,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -18012,9 +17963,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -18677,9 +18625,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -19342,9 +19287,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -20007,9 +19949,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -20672,9 +20611,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -21337,9 +21273,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -21990,9 +21923,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index ae017a9..2cfc1bd3 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -409,9 +409,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -2177,9 +2174,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": false
},
@@ -3720,9 +3714,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -4022,9 +4013,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -4327,7 +4315,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--enable-blink-features=HeapUnifiedGarbageCollection"
],
"swarming": {
@@ -4701,9 +4688,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -5072,9 +5056,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -5815,9 +5796,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -6655,9 +6633,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -7894,7 +7869,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--enable-features=ViewsBrowserWindows"
],
"swarming": {
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index ba49dd15..4460887 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -56,9 +56,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -369,9 +366,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -984,9 +978,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -1736,9 +1727,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -2430,9 +2418,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -3179,9 +3164,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 3cc94edf..a01c663 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -159,9 +159,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -1309,9 +1306,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -2477,9 +2471,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -3676,9 +3667,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -4814,9 +4802,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 8c59cae5..8112e9a 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -435,7 +435,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -2778,7 +2777,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
@@ -3580,9 +3578,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -4314,7 +4309,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
@@ -5428,7 +5422,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
@@ -6923,7 +6916,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
@@ -8183,7 +8175,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
@@ -8941,7 +8932,6 @@
},
{
"args": [
- "--gtest_filter=-*UsingRealWebcam*",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
@@ -9716,9 +9706,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 59a79342..67281ad 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -134,9 +134,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -989,9 +986,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -2212,9 +2206,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -3515,9 +3506,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -4246,9 +4234,6 @@
"test": "cacheinvalidation_unittests"
},
{
- "args": [
- "--gtest_filter=-*UsingRealWebcam*"
- ],
"swarming": {
"can_use_on_swarming_builders": true
},
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index b4473dda..e2e0e880 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -368,9 +368,6 @@
'capture_unittests': {
'args': [
'--test-launcher-jobs=1',
- # TODO(crbug.com/881300): After capture_unittests passes with vivid on VM,
- # we can run UsingRealWebcam tests except CaptureMjpeg.
- '--gtest_filter=-*UsingRealWebcam*',
],
},
'cc_unittests': {},
@@ -567,11 +564,7 @@
'boringssl_crypto_tests': {},
'boringssl_ssl_tests': {},
'cacheinvalidation_unittests': {},
- 'capture_unittests': {
- 'args': [
- '--gtest_filter=-*UsingRealWebcam*',
- ],
- },
+ 'capture_unittests': {},
'cast_unittests': {},
'components_browsertests': {},
'components_unittests': {
