From 7e26ad38285b36ac891872aba56706b10ea80733 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Fri, 16 Mar 2012 09:46:52 +0000 Subject: [PATCH] Disabled more flaky volume tests. BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/451012 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1902 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/test/auto_test/standard/volume_test.cc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/voice_engine/main/test/auto_test/standard/volume_test.cc b/src/voice_engine/main/test/auto_test/standard/volume_test.cc index 44887b744b..b00153d049 100644 --- a/src/voice_engine/main/test/auto_test/standard/volume_test.cc +++ b/src/voice_engine/main/test/auto_test/standard/volume_test.cc @@ -44,15 +44,18 @@ TEST_F(VolumeTest, ManualSetVolumeWorks) { #if !defined(MAC_IPHONE) -// NOTE(phoglund): This test is flaky because of how the OS works, and is hence -// disabled by default. +// TODO(phoglund): pending investigation in +// http://code.google.com/p/webrtc/issues/detail?id=367 TEST_F(VolumeTest, DISABLED_DefaultMicrophoneVolumeIsAtMost255) { unsigned int volume = 1000; EXPECT_EQ(0, voe_volume_control_->GetMicVolume(volume)); EXPECT_LE(volume, 255u); } -TEST_F(VolumeTest, ManualRequiresMicrophoneCanSetMicrophoneVolumeWithAcgOff) { +// TODO(phoglund): pending investigation in +// http://code.google.com/p/webrtc/issues/detail?id=367 +TEST_F(VolumeTest, + DISABLED_ManualRequiresMicrophoneCanSetMicrophoneVolumeWithAcgOff) { SwitchToManualMicrophone(); EXPECT_EQ(0, voe_apm_->SetAgcStatus(false)); @@ -123,15 +126,17 @@ TEST_F(VolumeTest, ManualInputMutingMutesMicrophone) { Sleep(2000); } -// NOTE(phoglund): This test is flaky because of how the OS works, and is hence -// disabled by default. +// TODO(phoglund): pending investigation in +// http://code.google.com/p/webrtc/issues/detail?id=367 TEST_F(VolumeTest, DISABLED_SystemInputMutingIsNotEnabledByDefault) { bool is_muted = true; EXPECT_EQ(0, voe_volume_control_->GetSystemInputMute(is_muted)); EXPECT_FALSE(is_muted); } -TEST_F(VolumeTest, ManualSystemInputMutingMutesMicrophone) { +// TODO(phoglund): pending investigation in +// http://code.google.com/p/webrtc/issues/detail?id=367 +TEST_F(VolumeTest, DISABLED_ManualSystemInputMutingMutesMicrophone) { SwitchToManualMicrophone(); // Enable system input muting.