| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1505 AddInterface(rtc::SocketAddress(kClientAddrHost1, kClientAddrPort)); | 1505 AddInterface(rtc::SocketAddress(kClientAddrHost1, kClientAddrPort)); |
| 1506 AddInterface(rtc::SocketAddress(kClientAddrHost2, kClientAddrPort)); | 1506 AddInterface(rtc::SocketAddress(kClientAddrHost2, kClientAddrPort)); |
| 1507 Init(); | 1507 Init(); |
| 1508 SendAudioVideoStream1(); | 1508 SendAudioVideoStream1(); |
| 1509 InitiateCall(); | 1509 InitiateCall(); |
| 1510 EXPECT_TRUE_WAIT(observer_.oncandidatesready_, kIceCandidatesTimeout); | 1510 EXPECT_TRUE_WAIT(observer_.oncandidatesready_, kIceCandidatesTimeout); |
| 1511 EXPECT_EQ(8u, observer_.mline_0_candidates_.size()); | 1511 EXPECT_EQ(8u, observer_.mline_0_candidates_.size()); |
| 1512 EXPECT_EQ(8u, observer_.mline_1_candidates_.size()); | 1512 EXPECT_EQ(8u, observer_.mline_1_candidates_.size()); |
| 1513 } | 1513 } |
| 1514 | 1514 |
| 1515 TEST_F(WebRtcSessionTest, TestStunError) { | 1515 // Crashes on Win only. See webrtc:5411. |
| 1516 #if defined(WEBRTC_WIN) |
| 1517 #define MAYBE_TestStunError DISABLED_TestStunError |
| 1518 #else |
| 1519 #define MAYBE_TestStunError TestStunError |
| 1520 #endif |
| 1521 TEST_F(WebRtcSessionTest, MAYBE_TestStunError) { |
| 1516 AddInterface(rtc::SocketAddress(kClientAddrHost1, kClientAddrPort)); | 1522 AddInterface(rtc::SocketAddress(kClientAddrHost1, kClientAddrPort)); |
| 1517 AddInterface(rtc::SocketAddress(kClientAddrHost2, kClientAddrPort)); | 1523 AddInterface(rtc::SocketAddress(kClientAddrHost2, kClientAddrPort)); |
| 1518 fss_->AddRule(false, | 1524 fss_->AddRule(false, |
| 1519 rtc::FP_UDP, | 1525 rtc::FP_UDP, |
| 1520 rtc::FD_ANY, | 1526 rtc::FD_ANY, |
| 1521 rtc::SocketAddress(kClientAddrHost1, kClientAddrPort)); | 1527 rtc::SocketAddress(kClientAddrHost1, kClientAddrPort)); |
| 1522 Init(); | 1528 Init(); |
| 1523 SendAudioVideoStream1(); | 1529 SendAudioVideoStream1(); |
| 1524 InitiateCall(); | 1530 InitiateCall(); |
| 1525 // Since kClientAddrHost1 is blocked, not expecting stun candidates for it. | 1531 // Since kClientAddrHost1 is blocked, not expecting stun candidates for it. |
| (...skipping 2788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4314 } | 4320 } |
| 4315 | 4321 |
| 4316 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4322 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 4317 // currently fails because upon disconnection and reconnection OnIceComplete is | 4323 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 4318 // called more than once without returning to IceGatheringGathering. | 4324 // called more than once without returning to IceGatheringGathering. |
| 4319 | 4325 |
| 4320 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4326 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
| 4321 WebRtcSessionTest, | 4327 WebRtcSessionTest, |
| 4322 testing::Values(ALREADY_GENERATED, | 4328 testing::Values(ALREADY_GENERATED, |
| 4323 DTLS_IDENTITY_STORE)); | 4329 DTLS_IDENTITY_STORE)); |
| OLD | NEW |