Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / base / physicalsocketserver_unittest.cc

diff --git a/src/third_party/libjingle/source/talk/base/physicalsocketserver_unittest.cc b/src/third_party/libjingle/source/talk/base/physicalsocketserver_unittest.cc
index 329cf5d..cbdbd9c 100644 (file)
--- a/src/third_party/libjingle/source/talk/base/physicalsocketserver_unittest.cc
+++ b/src/third_party/libjingle/source/talk/base/physicalsocketserver_unittest.cc
@@ -33,6 +33,7 @@
 #include "talk/base/physicalsocketserver.h"
 #include "talk/base/scoped_ptr.h"
 #include "talk/base/socket_unittest.h"
+#include "talk/base/testutils.h"
 #include "talk/base/thread.h"
 
 namespace talk_base {
@@ -74,21 +75,11 @@ TEST_F(PhysicalSocketTest, TestConnectWithDnsLookupFailIPv6) {
 }
 
 
-#ifdef OSX
-// This test crashes the OS X kernel on 10.6 (at bsd/netinet/tcp_subr.c:2118).
-TEST_F(PhysicalSocketTest, DISABLED_TestConnectWithClosedSocketIPv4) {
-#else
 TEST_F(PhysicalSocketTest, TestConnectWithClosedSocketIPv4) {
-#endif
   SocketTest::TestConnectWithClosedSocketIPv4();
 }
 
-#ifdef OSX
-// This test crashes the OS X kernel on 10.6 (at bsd/netinet/tcp_subr.c:2118).
-TEST_F(PhysicalSocketTest, DISABLED_TestConnectWithClosedSocketIPv6) {
-#else
 TEST_F(PhysicalSocketTest, TestConnectWithClosedSocketIPv6) {
-#endif
   SocketTest::TestConnectWithClosedSocketIPv6();
 }
 
@@ -227,7 +218,7 @@ Thread *PosixSignalDeliveryTest::signaled_thread_ = NULL;
 // Test receiving a synchronous signal while not in Wait() and then entering
 // Wait() afterwards.
 TEST_F(PosixSignalDeliveryTest, RaiseThenWait) {
-  ss_->SetPosixSignalHandler(SIGTERM, &RecordSignal);
+  ASSERT_TRUE(ss_->SetPosixSignalHandler(SIGTERM, &RecordSignal));
   raise(SIGTERM);
   EXPECT_TRUE(ss_->Wait(0, true));
   EXPECT_TRUE(ExpectSignal(SIGTERM));