Additional disabled tests in rtc_unittests.

It appears https://review.webrtc.org/30449004 was
not enough to get rtc_unittests up and running.

BUG=3836
TEST=Locally passing rtc_unittests on Mac Debug.
R=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7241 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-09-19 13:47:47 +00:00
parent fded02c164
commit 34ac7762e0
5 changed files with 14 additions and 13 deletions

View File

@ -127,7 +127,7 @@ class AsyncHttpRequestTest : public testing::Test,
TestHttpServer server_;
};
TEST_F(AsyncHttpRequestTest, TestGetSuccess) {
TEST_F(AsyncHttpRequestTest, DISABLED_ON_MAC(TestGetSuccess)) {
AsyncHttpRequest* req = CreateGetRequest(
kServerHostnameAddr.hostname(), server().address().port(),
kServerGetPath);

View File

@ -33,7 +33,7 @@ class WakeThread : public Thread {
#ifndef CARBON_DEPRECATED
// Test that MacCFSocketServer::Wait works as expected.
TEST(MacCFSocketServerTest, TestWait) {
TEST(MacCFSocketServerTest, DISABLED_TestWait) {
MacCFSocketServer server;
uint32 start = Time();
server.Wait(1000, true);
@ -41,7 +41,7 @@ TEST(MacCFSocketServerTest, TestWait) {
}
// Test that MacCFSocketServer::Wakeup works as expected.
TEST(MacCFSocketServerTest, TestWakeup) {
TEST(MacCFSocketServerTest, DISABLED_TestWakeup) {
MacCFSocketServer server;
WakeThread thread(&server);
uint32 start = Time();
@ -51,7 +51,7 @@ TEST(MacCFSocketServerTest, TestWakeup) {
}
// Test that MacCarbonSocketServer::Wait works as expected.
TEST(MacCarbonSocketServerTest, TestWait) {
TEST(MacCarbonSocketServerTest, DISABLED_TestWait) {
MacCarbonSocketServer server;
uint32 start = Time();
server.Wait(1000, true);
@ -59,7 +59,7 @@ TEST(MacCarbonSocketServerTest, TestWait) {
}
// Test that MacCarbonSocketServer::Wakeup works as expected.
TEST(MacCarbonSocketServerTest, TestWakeup) {
TEST(MacCarbonSocketServerTest, DISABLED_TestWakeup) {
MacCarbonSocketServer server;
WakeThread thread(&server);
uint32 start = Time();
@ -69,7 +69,7 @@ TEST(MacCarbonSocketServerTest, TestWakeup) {
}
// Test that MacCarbonAppSocketServer::Wait works as expected.
TEST(MacCarbonAppSocketServerTest, TestWait) {
TEST(MacCarbonAppSocketServerTest, DISABLED_TestWait) {
MacCarbonAppSocketServer server;
uint32 start = Time();
server.Wait(1000, true);
@ -77,7 +77,7 @@ TEST(MacCarbonAppSocketServerTest, TestWait) {
}
// Test that MacCarbonAppSocketServer::Wakeup works as expected.
TEST(MacCarbonAppSocketServerTest, TestWakeup) {
TEST(MacCarbonAppSocketServerTest, DISABLED_TestWakeup) {
MacCarbonAppSocketServer server;
WakeThread thread(&server);
uint32 start = Time();
@ -226,11 +226,11 @@ class MacCarbonAppAsyncSocketTest : public MacAsyncSocketTest {
};
};
TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv4) {
TEST_F(MacCarbonAppAsyncSocketTest, DISABLED_TestSocketServerWaitIPv4) {
SocketTest::TestSocketServerWaitIPv4();
}
TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv6) {
TEST_F(MacCarbonAppAsyncSocketTest, DISABLED_TestSocketServerWaitIPv6) {
SocketTest::TestSocketServerWaitIPv6();
}
#endif

View File

@ -10,6 +10,7 @@
#include "webrtc/base/gunit.h"
#include "webrtc/base/stream.h"
#include "webrtc/test/testsupport/gtest_disable.h"
namespace rtc {
@ -434,7 +435,7 @@ TEST(FifoBufferTest, WriteOffsetAndReadOffset) {
EXPECT_EQ(SR_BLOCK, buf.ReadOffset(out, 10, 16, NULL));
}
TEST(AsyncWriteTest, TestWrite) {
TEST(AsyncWriteTest, DISABLED_ON_MAC(TestWrite)) {
FifoBuffer* buf = new FifoBuffer(100);
AsyncWriteStream stream(buf, Thread::Current());
EXPECT_EQ(SS_OPEN, stream.GetState());

View File

@ -289,7 +289,7 @@ class TaskTest : public sigslot::has_slots<> {
TaskInfo happy_[HAPPY_TASK_COUNT];
};
TEST(start_task_test, Timeout) {
TEST(start_task_test, DISABLED_ON_MAC(Timeout)) {
TaskTest task_test;
task_test.Start();
task_test.check_passed();
@ -480,7 +480,7 @@ class TimeoutChangeTest : public sigslot::has_slots<> {
DISALLOW_EVIL_CONSTRUCTORS(TimeoutChangeTest);
};
TEST(start_task_test, TimeoutChange) {
TEST(start_task_test, DISABLED_ON_MAC(TimeoutChange)) {
TimeoutChangeTest timeout_change_test;
timeout_change_test.Start();
}

View File

@ -105,7 +105,7 @@ class DeleteThreadCheckerClassOnThread : public Thread {
} // namespace
TEST(ThreadCheckerTest, CallsAllowedOnSameThread) {
TEST(ThreadCheckerTest, DISABLED_ON_MAC(CallsAllowedOnSameThread)) {
scoped_ptr<ThreadCheckerClass> thread_checker_class(
new ThreadCheckerClass);