Commit 7f6fd898 authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Disable audio input tests on macOS for arm64.

No one is able to repro, so for now disable the tests.

R=tguilbert

Bug: 1128458
Change-Id: I50a66a7892a6e0d3e01cf4788d0b6072e66ed308
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485340
Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Thomas Guilbert <tguilbert@chromium.org>
Reviewed-by: default avatarThomas Guilbert <tguilbert@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819005}
parent 0092862f
...@@ -88,6 +88,10 @@ class AudioInputTest : public testing::Test { ...@@ -88,6 +88,10 @@ class AudioInputTest : public testing::Test {
// FuchsiaAudioCapturerStream. It implements AudioCapturerStream interface // FuchsiaAudioCapturerStream. It implements AudioCapturerStream interface
// and runs in the renderer process. // and runs in the renderer process.
return false; return false;
#elif defined(OS_MAC) && defined(ARCH_CPU_ARM64)
// TODO(crbug.com/1128458): macOS on ARM64 says it has devices, but won't
// let any of them be opened or listed.
return false;
#else #else
return AudioDeviceInfoAccessorForTests(audio_manager_.get()) return AudioDeviceInfoAccessorForTests(audio_manager_.get())
.HasAudioInputDevices(); .HasAudioInputDevices();
...@@ -135,11 +139,12 @@ class AudioInputTest : public testing::Test { ...@@ -135,11 +139,12 @@ class AudioInputTest : public testing::Test {
params, AudioDeviceDescription::kDefaultDeviceId, params, AudioDeviceDescription::kDefaultDeviceId,
base::BindRepeating(&AudioInputTest::OnLogMessage, base::BindRepeating(&AudioInputTest::OnLogMessage,
base::Unretained(this))); base::Unretained(this)));
EXPECT_TRUE(audio_input_stream_); ASSERT_TRUE(audio_input_stream_);
} }
void OpenAndClose() { void OpenAndClose() {
DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread()); DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
ASSERT_TRUE(audio_input_stream_);
EXPECT_TRUE(audio_input_stream_->Open()); EXPECT_TRUE(audio_input_stream_->Open());
audio_input_stream_->Close(); audio_input_stream_->Close();
audio_input_stream_ = nullptr; audio_input_stream_ = nullptr;
...@@ -147,12 +152,14 @@ class AudioInputTest : public testing::Test { ...@@ -147,12 +152,14 @@ class AudioInputTest : public testing::Test {
void OpenAndStart(AudioInputStream::AudioInputCallback* sink) { void OpenAndStart(AudioInputStream::AudioInputCallback* sink) {
DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread()); DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
ASSERT_TRUE(audio_input_stream_);
EXPECT_TRUE(audio_input_stream_->Open()); EXPECT_TRUE(audio_input_stream_->Open());
audio_input_stream_->Start(sink); audio_input_stream_->Start(sink);
} }
void OpenStopAndClose() { void OpenStopAndClose() {
DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread()); DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
ASSERT_TRUE(audio_input_stream_);
EXPECT_TRUE(audio_input_stream_->Open()); EXPECT_TRUE(audio_input_stream_->Open());
audio_input_stream_->Stop(); audio_input_stream_->Stop();
audio_input_stream_->Close(); audio_input_stream_->Close();
...@@ -161,6 +168,7 @@ class AudioInputTest : public testing::Test { ...@@ -161,6 +168,7 @@ class AudioInputTest : public testing::Test {
void StopAndClose() { void StopAndClose() {
DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread()); DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
ASSERT_TRUE(audio_input_stream_);
audio_input_stream_->Stop(); audio_input_stream_->Stop();
audio_input_stream_->Close(); audio_input_stream_->Close();
audio_input_stream_ = nullptr; audio_input_stream_ = nullptr;
......
...@@ -436,7 +436,13 @@ class AudioManagerTest : public ::testing::Test { ...@@ -436,7 +436,13 @@ class AudioManagerTest : public ::testing::Test {
#endif // defined(USE_CRAS) && defined(OS_CHROMEOS) #endif // defined(USE_CRAS) && defined(OS_CHROMEOS)
bool InputDevicesAvailable() { bool InputDevicesAvailable() {
#if defined(OS_MAC) && defined(ARCH_CPU_ARM64)
// TODO(crbug.com/1128458): macOS on ARM64 says it has devices, but won't
// let any of them be opened or listed.
return false;
#else
return device_info_accessor_->HasAudioInputDevices(); return device_info_accessor_->HasAudioInputDevices();
#endif
} }
bool OutputDevicesAvailable() { bool OutputDevicesAvailable() {
return device_info_accessor_->HasAudioOutputDevices(); return device_info_accessor_->HasAudioOutputDevices();
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "base/test/task_environment.h" #include "base/test/task_environment.h"
#include "base/test/test_timeouts.h" #include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h" #include "base/threading/platform_thread.h"
#include "build/build_config.h"
#include "media/audio/audio_device_description.h" #include "media/audio/audio_device_description.h"
#include "media/audio/audio_device_info_accessor_for_tests.h" #include "media/audio/audio_device_info_accessor_for_tests.h"
#include "media/audio/audio_io.h" #include "media/audio/audio_io.h"
...@@ -124,8 +125,14 @@ class MacAudioInputTest : public testing::Test { ...@@ -124,8 +125,14 @@ class MacAudioInputTest : public testing::Test {
~MacAudioInputTest() override { audio_manager_->Shutdown(); } ~MacAudioInputTest() override { audio_manager_->Shutdown(); }
bool InputDevicesAvailable() { bool InputDevicesAvailable() {
#if defined(OS_MAC) && defined(ARCH_CPU_ARM64)
// TODO(crbug.com/1128458): macOS on ARM64 says it has devices, but won't
// let any of them be opened or listed.
return false;
#else
return AudioDeviceInfoAccessorForTests(audio_manager_.get()) return AudioDeviceInfoAccessorForTests(audio_manager_.get())
.HasAudioInputDevices(); .HasAudioInputDevices();
#endif
} }
// Convenience method which creates a default AudioInputStream object using // Convenience method which creates a default AudioInputStream object using
......
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