Enabled the volume tests we believe are nonflaky and the vie_auto_test extended tests.

BUG=
TEST=

Review URL: https://webrtc-codereview.appspot.com/422002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1797 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2012-02-29 14:34:06 +00:00
parent 52493bd559
commit 2d124f3d88
2 changed files with 8 additions and 7 deletions

View File

@ -44,7 +44,9 @@ TEST_F(VolumeTest, ManualSetVolumeWorks) {
#if !defined(MAC_IPHONE)
TEST_F(VolumeTest, DefaultMicrophoneVolumeIsAtMost255) {
// NOTE(phoglund): This test is flaky because of how the OS works, and is hence
// disabled by default.
TEST_F(VolumeTest, DISABLED_DefaultMicrophoneVolumeIsAtMost255) {
unsigned int volume = 1000;
EXPECT_EQ(0, voe_volume_control_->GetMicVolume(volume));
EXPECT_LE(volume, 255u);
@ -121,7 +123,9 @@ TEST_F(VolumeTest, ManualInputMutingMutesMicrophone) {
Sleep(2000);
}
TEST_F(VolumeTest, SystemInputMutingIsNotEnabledByDefault) {
// NOTE(phoglund): This test is flaky because of how the OS works, and is hence
// disabled by default.
TEST_F(VolumeTest, DISABLED_SystemInputMutingIsNotEnabledByDefault) {
bool is_muted = true;
EXPECT_EQ(0, voe_volume_control_->GetSystemInputMute(is_muted));
EXPECT_FALSE(is_muted);

View File

@ -621,8 +621,7 @@ class WebRTCLinuxFactory(WebRTCFactory):
binary = 'out/Debug/vie_auto_test'
args = (
'--automated --gtest_filter="'
'-ViEVideoVerificationTest.RunsFullStackWithoutErrors:'
'ViEExtendedIntegrationTest.*" '
'-ViEVideoVerificationTest.RunsFullStackWithoutErrors" '
'--capture_test_ensure_resolution_alignment_in_capture_device=false')
self.AddXvfbTestRunStep(test_name=test, test_binary=binary,
test_arguments=args)
@ -630,9 +629,7 @@ class WebRTCLinuxFactory(WebRTCFactory):
self.AddXvfbTestRunStep(test_name=test,
test_binary='out/Debug/video_render_module_test')
elif test == 'voe_auto_test':
# TODO(phoglund): Remove this notice and take appropriate action when
# http://code.google.com/p/webrtc/issues/detail?id=266 is concluded.
cmd = 'out/Debug/voe_auto_test --automated --gtest_filter="-VolumeTest.*"'
cmd = 'out/Debug/voe_auto_test --automated'
self.AddCommonTestRunStep(test=test, cmd=cmd)
else:
self.AddCommonTestRunStep(test)