Commit f3582f92 authored by Henrik Boström's avatar Henrik Boström Committed by Commit Bot

[macOS Capture] Re-enable VideoCaptureDeviceAVFoundationMacTest*

These were previously disabled in order to investigate device related
failures on a post-CQ bot that have since been resolved.

TBR=handellm@google.com, ccameron@chromium.org, mbonadei@chromium.org

Bug: chromium:1128470, chromium:1129807
Change-Id: I357fa8c0122ce955a0ca16b83d704743011e470c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440355Reviewed-by: default avatarHenrik Boström <hbos@chromium.org>
Commit-Queue: Henrik Boström <hbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811973}
parent 054dc087
...@@ -19,7 +19,7 @@ using testing::_; ...@@ -19,7 +19,7 @@ using testing::_;
namespace media { namespace media {
TEST(VideoCaptureDeviceAVFoundationMacTest, DISABLED_TakePhoto) { TEST(VideoCaptureDeviceAVFoundationMacTest, TakePhoto) {
RunTestCase(base::BindOnce([] { RunTestCase(base::BindOnce([] {
NSString* deviceId = GetFirstDeviceId(); NSString* deviceId = GetFirstDeviceId();
if (!deviceId) { if (!deviceId) {
...@@ -46,8 +46,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest, DISABLED_TakePhoto) { ...@@ -46,8 +46,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest, DISABLED_TakePhoto) {
})); }));
} }
TEST(VideoCaptureDeviceAVFoundationMacTest, TEST(VideoCaptureDeviceAVFoundationMacTest, StopCaptureWhileTakingPhoto) {
DISABLED_StopCaptureWhileTakingPhoto) {
RunTestCase(base::BindOnce([] { RunTestCase(base::BindOnce([] {
NSString* deviceId = GetFirstDeviceId(); NSString* deviceId = GetFirstDeviceId();
if (!deviceId) { if (!deviceId) {
...@@ -78,8 +77,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest, ...@@ -78,8 +77,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest,
})); }));
} }
TEST(VideoCaptureDeviceAVFoundationMacTest, TEST(VideoCaptureDeviceAVFoundationMacTest, MultiplePendingTakePhotos) {
DISABLED_MultiplePendingTakePhotos) {
RunTestCase(base::BindOnce([] { RunTestCase(base::BindOnce([] {
NSString* deviceId = GetFirstDeviceId(); NSString* deviceId = GetFirstDeviceId();
if (!deviceId) { if (!deviceId) {
...@@ -115,7 +113,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest, ...@@ -115,7 +113,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest,
} }
TEST(VideoCaptureDeviceAVFoundationMacTest, TEST(VideoCaptureDeviceAVFoundationMacTest,
DISABLED_StopCaptureWhileMultiplePendingTakePhotos) { StopCaptureWhileMultiplePendingTakePhotos) {
RunTestCase(base::BindOnce([] { RunTestCase(base::BindOnce([] {
NSString* deviceId = GetFirstDeviceId(); NSString* deviceId = GetFirstDeviceId();
if (!deviceId) { if (!deviceId) {
...@@ -155,7 +153,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest, ...@@ -155,7 +153,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest,
} }
TEST(VideoCaptureDeviceAVFoundationMacTest, TEST(VideoCaptureDeviceAVFoundationMacTest,
DISABLED_StopStillImageOutputWhenNoLongerTakingPhotos) { StopStillImageOutputWhenNoLongerTakingPhotos) {
RunTestCase(base::BindOnce([] { RunTestCase(base::BindOnce([] {
NSString* deviceId = GetFirstDeviceId(); NSString* deviceId = GetFirstDeviceId();
if (!deviceId) { if (!deviceId) {
...@@ -192,7 +190,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest, ...@@ -192,7 +190,7 @@ TEST(VideoCaptureDeviceAVFoundationMacTest,
// This test ensures we don't crash even if we leave operations pending. // This test ensures we don't crash even if we leave operations pending.
TEST(VideoCaptureDeviceAVFoundationMacTest, TEST(VideoCaptureDeviceAVFoundationMacTest,
DISABLED_TakePhotoAndShutDownWithoutWaiting) { TakePhotoAndShutDownWithoutWaiting) {
RunTestCase(base::BindOnce([] { RunTestCase(base::BindOnce([] {
NSString* deviceId = GetFirstDeviceId(); NSString* deviceId = GetFirstDeviceId();
if (!deviceId) { if (!deviceId) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment