zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable allmost all base tests.

Browse Source 
BUG=3836
R=marpan@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7416 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-10-09 22:08:15 +00:00
parent 4a73519690
commit c732a3e511
19 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/base/proxy_unittest.cc
View File

@ -75,7 +75,7 @@ class ProxyTest : public testing::Test {
};
// Tests whether we can use a SOCKS5 proxy to connect to a server.
TEST_F(ProxyTest, DISABLED_ON_MAC(TestSocks5Connect)) {
TEST_F(ProxyTest, TestSocks5Connect) {
rtc::AsyncSocket* socket =
ss()->CreateAsyncSocket(kSocksProxyIntAddr.family(), SOCK_STREAM);
rtc::AsyncSocksProxySocket* proxy_socket =
@ -119,7 +119,7 @@ TEST_F(ProxyTest, TestHttpsConnect) {
*/
// Tests whether we can autodetect a SOCKS5 proxy.
TEST_F(ProxyTest, DISABLED_ON_MAC(TestAutoDetectSocks5)) {
TEST_F(ProxyTest, TestAutoDetectSocks5) {
EXPECT_EQ(rtc::PROXY_SOCKS5, DetectProxyType(kSocksProxyIntAddr));
}
@ -131,6 +131,6 @@ TEST_F(ProxyTest, TestAutoDetectHttps) {
*/
// Tests whether we fail properly for no proxy.
TEST_F(ProxyTest, DISABLED_ON_MAC(TestAutoDetectBogus)) {
TEST_F(ProxyTest, TestAutoDetectBogus) {
EXPECT_EQ(rtc::PROXY_UNKNOWN, DetectProxyType(kBogusProxyIntAddr));
}