| 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 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1297 } | 1297 } |
| 1298 | 1298 |
| 1299 TEST_F(P2PTransportChannelTest, TestIceRoleConflict) { | 1299 TEST_F(P2PTransportChannelTest, TestIceRoleConflict) { |
| 1300 AddAddress(0, kPublicAddrs[0]); | 1300 AddAddress(0, kPublicAddrs[0]); |
| 1301 AddAddress(1, kPublicAddrs[1]); | 1301 AddAddress(1, kPublicAddrs[1]); |
| 1302 TestSignalRoleConflict(); | 1302 TestSignalRoleConflict(); |
| 1303 } | 1303 } |
| 1304 | 1304 |
| 1305 // Tests that the ice configs (protocol, tiebreaker and role) can be passed | 1305 // Tests that the ice configs (protocol, tiebreaker and role) can be passed |
| 1306 // down to ports. | 1306 // down to ports. |
| 1307 TEST_F(P2PTransportChannelTest, TestIceConfigWillPassDownToPort) { | 1307 // Disable on Windows because it is flaky. |
| 1308 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6019 |
| 1309 #if defined(WEBRTC_WIN) |
| 1310 #define MAYBE_TestIceConfigWillPassDownToPort DISABLED_TestIceConfigWillPassDown
ToPort |
| 1311 #else |
| 1312 #define MAYBE_TestIceConfigWillPassDownToPort TestIceConfigWillPassDownToPort |
| 1313 #endif |
| 1314 TEST_F(P2PTransportChannelTest, MAYBE_TestIceConfigWillPassDownToPort) { |
| 1308 AddAddress(0, kPublicAddrs[0]); | 1315 AddAddress(0, kPublicAddrs[0]); |
| 1309 AddAddress(1, kPublicAddrs[1]); | 1316 AddAddress(1, kPublicAddrs[1]); |
| 1310 | 1317 |
| 1311 SetIceRole(0, cricket::ICEROLE_CONTROLLING); | 1318 SetIceRole(0, cricket::ICEROLE_CONTROLLING); |
| 1312 SetIceTiebreaker(0, kTiebreaker1); | 1319 SetIceTiebreaker(0, kTiebreaker1); |
| 1313 SetIceRole(1, cricket::ICEROLE_CONTROLLING); | 1320 SetIceRole(1, cricket::ICEROLE_CONTROLLING); |
| 1314 SetIceTiebreaker(1, kTiebreaker2); | 1321 SetIceTiebreaker(1, kTiebreaker2); |
| 1315 | 1322 |
| 1316 CreateChannels(1); | 1323 CreateChannels(1); |
| 1317 | 1324 |
| (...skipping 1650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2968 | 2975 |
| 2969 // TCP Relay/Relay is the next. | 2976 // TCP Relay/Relay is the next. |
| 2970 VerifyNextPingableConnection(cricket::RELAY_PORT_TYPE, | 2977 VerifyNextPingableConnection(cricket::RELAY_PORT_TYPE, |
| 2971 cricket::RELAY_PORT_TYPE, | 2978 cricket::RELAY_PORT_TYPE, |
| 2972 cricket::TCP_PROTOCOL_NAME); | 2979 cricket::TCP_PROTOCOL_NAME); |
| 2973 | 2980 |
| 2974 // Finally, Local/Relay will be pinged. | 2981 // Finally, Local/Relay will be pinged. |
| 2975 VerifyNextPingableConnection(cricket::LOCAL_PORT_TYPE, | 2982 VerifyNextPingableConnection(cricket::LOCAL_PORT_TYPE, |
| 2976 cricket::RELAY_PORT_TYPE); | 2983 cricket::RELAY_PORT_TYPE); |
| 2977 } | 2984 } |
| OLD | NEW |