OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 1703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1714 | 1714 |
1715 SetSignalingReceivers(); | 1715 SetSignalingReceivers(); |
1716 receiving_client()->SetExpectIceRestart(true); | 1716 receiving_client()->SetExpectIceRestart(true); |
1717 LocalP2PTest(); | 1717 LocalP2PTest(); |
1718 VerifyRenderedSize(640, 480); | 1718 VerifyRenderedSize(640, 480); |
1719 } | 1719 } |
1720 | 1720 |
1721 // This test sets up a non-bundle call and apply bundle during ICE restart. When | 1721 // This test sets up a non-bundle call and apply bundle during ICE restart. When |
1722 // bundle is in effect in the restart, the channel can successfully reset its | 1722 // bundle is in effect in the restart, the channel can successfully reset its |
1723 // DTLS-SRTP context. | 1723 // DTLS-SRTP context. |
1724 #if defined(MEMORY_SANITIZER) | 1724 TEST_F(P2PTestConductor, LocalP2PTestDtlsBundleInIceRestart) { |
1725 // Fails under MemorySanitizer: | |
1726 // See https://bugs.chromium.org/p/webrtc/issues/detail?id=6811 | |
1727 #define MAYBE_LocalP2PTestDtlsBundleInIceRestart \ | |
1728 DISABLED_LocalP2PTestDtlsBundleInIceRestart | |
1729 #else | |
1730 #define MAYBE_LocalP2PTestDtlsBundleInIceRestart \ | |
1731 LocalP2PTestDtlsBundleInIceRestart | |
1732 #endif | |
1733 TEST_F(P2PTestConductor, MAYBE_LocalP2PTestDtlsBundleInIceRestart) { | |
1734 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); | 1725 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); |
1735 FakeConstraints setup_constraints; | 1726 FakeConstraints setup_constraints; |
1736 setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, | 1727 setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, |
1737 true); | 1728 true); |
1738 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); | 1729 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); |
1739 receiving_client()->RemoveBundleFromReceivedSdp(true); | 1730 receiving_client()->RemoveBundleFromReceivedSdp(true); |
1740 LocalP2PTest(); | 1731 LocalP2PTest(); |
1741 VerifyRenderedSize(640, 480); | 1732 VerifyRenderedSize(640, 480); |
1742 | 1733 |
1743 initializing_client()->IceRestart(); | 1734 initializing_client()->IceRestart(); |
(...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2799 server.urls.push_back("turn:hostname2"); | 2790 server.urls.push_back("turn:hostname2"); |
2800 servers.push_back(server); | 2791 servers.push_back(server); |
2801 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); | 2792 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); |
2802 EXPECT_EQ(2U, turn_servers_.size()); | 2793 EXPECT_EQ(2U, turn_servers_.size()); |
2803 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); | 2794 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); |
2804 } | 2795 } |
2805 | 2796 |
2806 #endif // if !defined(THREAD_SANITIZER) | 2797 #endif // if !defined(THREAD_SANITIZER) |
2807 | 2798 |
2808 } // namespace | 2799 } // namespace |
OLD | NEW |