generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disabled flaky test on Linux, added disable-on-platform macros, fixed \n's

Browse Source 
BUG=1155

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3178 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2012-11-28 12:28:06 +00:00
parent c4590580e8
commit 8d334d387b
5 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
View File

@ -39,6 +39,25 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gmock/gmock.h" #include "gmock/gmock.h"
// Helper macros for platform disables. These can be chained.
#ifdef WEBRTC_LINUX
#define DISABLED_ON_LINUX(test) DISABLED_##test
#else
#define DISABLED_ON_LINUX(test) test
#endif
#ifdef WEBRTC_MAC
#define DISABLED_ON_MAC(test) DISABLED_##test
#else
#define DISABLED_ON_MAC(test) test
#endif
#ifdef _WIN32
#define DISABLED_ON_WIN(test) DISABLED_##test
#else
#define DISABLED_ON_WIN(test) test
#endif
// This convenient fixture sets up all voice engine interfaces automatically for // This convenient fixture sets up all voice engine interfaces automatically for
// use by testing subclasses. It allocates each interface and releases it once // use by testing subclasses. It allocates each interface and releases it once
// which means that if a tests allocates additional interfaces from the voice // which means that if a tests allocates additional interfaces from the voice

2
webrtc/voice_engine/test/auto_test/standard/file_test.cc
View File

@ -27,7 +27,7 @@ class FileTest : public AfterStreamingFixture {
TEST_F(FileTest, ManualRecordToFileForThreeSecondsAndPlayback) { TEST_F(FileTest, ManualRecordToFileForThreeSecondsAndPlayback) {
if (!FLAGS_include_timing_dependent_tests) { if (!FLAGS_include_timing_dependent_tests) {
TEST_LOG("Skipping test - running in slow execution environment.../n"); TEST_LOG("Skipping test - running in slow execution environment...\n");
return; return;
} }

8
webrtc/voice_engine/test/auto_test/standard/network_test.cc
View File

@ -143,9 +143,11 @@ TEST_F(NetworkTest, DoesNotCallDeRegisteredObserver) {
Sleep(1500); Sleep(1500);
} }
TEST_F(NetworkTest, DeadOrAliveObserverSeesAliveMessagesIfEnabled) { // TODO(phoglund): flaky on Linux
TEST_F(NetworkTest,
DISABLED_ON_LINUX(DeadOrAliveObserverSeesAliveMessagesIfEnabled)) {
if (!FLAGS_include_timing_dependent_tests) { if (!FLAGS_include_timing_dependent_tests) {
TEST_LOG("Skipping test - running in slow execution environment.../n"); TEST_LOG("Skipping test - running in slow execution environment...\n");
return; return;
} }
@ -165,7 +167,7 @@ TEST_F(NetworkTest, DeadOrAliveObserverSeesAliveMessagesIfEnabled) {
TEST_F(NetworkTest, DeadOrAliveObserverSeesDeadMessagesIfEnabled) { TEST_F(NetworkTest, DeadOrAliveObserverSeesDeadMessagesIfEnabled) {
if (!FLAGS_include_timing_dependent_tests) { if (!FLAGS_include_timing_dependent_tests) {
TEST_LOG("Skipping test - running in slow execution environment.../n"); TEST_LOG("Skipping test - running in slow execution environment...\n");
return; return;
} }

2
webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
View File

@ -140,7 +140,7 @@ void RtcpAppHandler::Reset() {
TEST_F(RtpRtcpTest, RemoteRtcpCnameHasPropagatedToRemoteSide) { TEST_F(RtpRtcpTest, RemoteRtcpCnameHasPropagatedToRemoteSide) {
if (!FLAGS_include_timing_dependent_tests) { if (!FLAGS_include_timing_dependent_tests) {
TEST_LOG("Skipping test - running in slow execution environment.../n"); TEST_LOG("Skipping test - running in slow execution environment...\n");
return; return;
} }

6
webrtc/voice_engine/test/auto_test/standard/volume_test.cc
View File

@ -10,12 +10,6 @@
#include "after_streaming_fixture.h" #include "after_streaming_fixture.h"
#ifdef WEBRTC_LINUX
#define DISABLED_ON_LINUX(test) DISABLED_##test
#else
#define DISABLED_ON_LINUX(test) test
#endif
class VolumeTest : public AfterStreamingFixture { class VolumeTest : public AfterStreamingFixture {
}; };