| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 116 |
| 117 TEST_F(MacAsyncSocketTest, TestConnectWithDnsLookupIPv6) { | 117 TEST_F(MacAsyncSocketTest, TestConnectWithDnsLookupIPv6) { |
| 118 SocketTest::TestConnectWithDnsLookupIPv6(); | 118 SocketTest::TestConnectWithDnsLookupIPv6(); |
| 119 } | 119 } |
| 120 | 120 |
| 121 // BUG=https://code.google.com/p/webrtc/issues/detail?id=2272 | 121 // BUG=https://code.google.com/p/webrtc/issues/detail?id=2272 |
| 122 TEST_F(MacAsyncSocketTest, DISABLED_TestConnectFailIPv4) { | 122 TEST_F(MacAsyncSocketTest, DISABLED_TestConnectFailIPv4) { |
| 123 SocketTest::TestConnectFailIPv4(); | 123 SocketTest::TestConnectFailIPv4(); |
| 124 } | 124 } |
| 125 | 125 |
| 126 TEST_F(MacAsyncSocketTest, TestConnectFailIPv6) { | 126 // Flaky. See webrtc:4738. |
| 127 TEST_F(MacAsyncSocketTest, DISABLED_TestConnectFailIPv6) { |
| 127 SocketTest::TestConnectFailIPv6(); | 128 SocketTest::TestConnectFailIPv6(); |
| 128 } | 129 } |
| 129 | 130 |
| 130 // Reenable once we have mac async dns | 131 // Reenable once we have mac async dns |
| 131 TEST_F(MacAsyncSocketTest, DISABLED_TestConnectWithDnsLookupFailIPv4) { | 132 TEST_F(MacAsyncSocketTest, DISABLED_TestConnectWithDnsLookupFailIPv4) { |
| 132 SocketTest::TestConnectWithDnsLookupFailIPv4(); | 133 SocketTest::TestConnectWithDnsLookupFailIPv4(); |
| 133 } | 134 } |
| 134 | 135 |
| 135 TEST_F(MacAsyncSocketTest, DISABLED_TestConnectWithDnsLookupFailIPv6) { | 136 TEST_F(MacAsyncSocketTest, DISABLED_TestConnectWithDnsLookupFailIPv6) { |
| 136 SocketTest::TestConnectWithDnsLookupFailIPv6(); | 137 SocketTest::TestConnectWithDnsLookupFailIPv6(); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 | 229 |
| 229 TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv4) { | 230 TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv4) { |
| 230 SocketTest::TestSocketServerWaitIPv4(); | 231 SocketTest::TestSocketServerWaitIPv4(); |
| 231 } | 232 } |
| 232 | 233 |
| 233 TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv6) { | 234 TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv6) { |
| 234 SocketTest::TestSocketServerWaitIPv6(); | 235 SocketTest::TestSocketServerWaitIPv6(); |
| 235 } | 236 } |
| 236 #endif | 237 #endif |
| 237 } // namespace rtc | 238 } // namespace rtc |
| OLD | NEW |