| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2013 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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 } | 394 } |
| 395 #endif // HAVE_QUIC | 395 #endif // HAVE_QUIC |
| 396 | 396 |
| 397 // Verifies that a DataChannel added from an OPEN message functions after | 397 // Verifies that a DataChannel added from an OPEN message functions after |
| 398 // a channel has been previously closed (webrtc issue 3778). | 398 // a channel has been previously closed (webrtc issue 3778). |
| 399 // This previously failed because the new channel re-uses the ID of the closed | 399 // This previously failed because the new channel re-uses the ID of the closed |
| 400 // channel, and the closed channel was incorrectly still assigned to the id. | 400 // channel, and the closed channel was incorrectly still assigned to the id. |
| 401 // TODO(deadbeef): This is disabled because there's currently a race condition | 401 // TODO(deadbeef): This is disabled because there's currently a race condition |
| 402 // caused by the fact that a data channel signals that it's closed before it | 402 // caused by the fact that a data channel signals that it's closed before it |
| 403 // really is. Re-enable this test once that's fixed. | 403 // really is. Re-enable this test once that's fixed. |
| 404 // See: https://bugs.chromium.org/p/webrtc/issues/detail?id=4453 |
| 404 TEST_F(PeerConnectionEndToEndTest, | 405 TEST_F(PeerConnectionEndToEndTest, |
| 405 DISABLED_DataChannelFromOpenWorksAfterClose) { | 406 DISABLED_DataChannelFromOpenWorksAfterClose) { |
| 406 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); | 407 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); |
| 407 | 408 |
| 408 CreatePcs(); | 409 CreatePcs(); |
| 409 | 410 |
| 410 webrtc::DataChannelInit init; | 411 webrtc::DataChannelInit init; |
| 411 rtc::scoped_refptr<DataChannelInterface> caller_dc( | 412 rtc::scoped_refptr<DataChannelInterface> caller_dc( |
| 412 caller_->CreateDataChannel("data", init)); | 413 caller_->CreateDataChannel("data", init)); |
| 413 | 414 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 0); | 446 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 0); |
| 446 // This removes the reference to the remote data channel that we hold. | 447 // This removes the reference to the remote data channel that we hold. |
| 447 callee_signaled_data_channels_.clear(); | 448 callee_signaled_data_channels_.clear(); |
| 448 caller_dc->Close(); | 449 caller_dc->Close(); |
| 449 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); | 450 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); |
| 450 | 451 |
| 451 // Wait for a bit longer so the remote data channel will receive the | 452 // Wait for a bit longer so the remote data channel will receive the |
| 452 // close message and be destroyed. | 453 // close message and be destroyed. |
| 453 rtc::Thread::Current()->ProcessMessages(100); | 454 rtc::Thread::Current()->ProcessMessages(100); |
| 454 } | 455 } |
| OLD | NEW |