commit fded02c164ea4cc3d28d7f30ac9ce9d94d76ef7a
author henrike@webrtc.org <henrike@webrtc.org> Fri Sep 19 13:10:10 2014 +0000
committer henrike@webrtc.org <henrike@webrtc.org> Fri Sep 19 13:10:10 2014 +0000
tree 3c98ca7c2c27f980def46299a6f32416357fa0b2
parent bbe0a8517d7f9da7aa779bff77cdbb70df358437

base: disabled several base tests on Mac so that rtc_unittests can be turned back on

BUG=N/A
R=kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7240 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/base/proxy_unittest.cc

diff --git a/webrtc/base/proxy_unittest.cc b/webrtc/base/proxy_unittest.cc
index d8a523f..a1ade0c 100644
--- a/webrtc/base/proxy_unittest.cc
+++ b/webrtc/base/proxy_unittest.cc
@@ -17,6 +17,7 @@
 #include "webrtc/base/testclient.h"
 #include "webrtc/base/testechoserver.h"
 #include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/test/testsupport/gtest_disable.h"
 
 using rtc::Socket;
 using rtc::Thread;
@@ -74,7 +75,7 @@
 };
 
 // Tests whether we can use a SOCKS5 proxy to connect to a server.
-TEST_F(ProxyTest, TestSocks5Connect) {
+TEST_F(ProxyTest, DISABLED_ON_MAC(TestSocks5Connect)) {
   rtc::AsyncSocket* socket =
       ss()->CreateAsyncSocket(kSocksProxyIntAddr.family(), SOCK_STREAM);
   rtc::AsyncSocksProxySocket* proxy_socket =
@@ -118,7 +119,7 @@
 */
 
 // Tests whether we can autodetect a SOCKS5 proxy.
-TEST_F(ProxyTest, TestAutoDetectSocks5) {
+TEST_F(ProxyTest, DISABLED_ON_MAC(TestAutoDetectSocks5)) {
   EXPECT_EQ(rtc::PROXY_SOCKS5, DetectProxyType(kSocksProxyIntAddr));
 }
 
@@ -130,6 +131,6 @@
 */
 
 // Tests whether we fail properly for no proxy.
-TEST_F(ProxyTest, TestAutoDetectBogus) {
+TEST_F(ProxyTest, DISABLED_ON_MAC(TestAutoDetectBogus)) {
   EXPECT_EQ(rtc::PROXY_UNKNOWN, DetectProxyType(kBogusProxyIntAddr));
 }