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 2028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2039 // Test that GCM isn't used if only the initiator supports it. | 2039 // Test that GCM isn't used if only the initiator supports it. |
2040 TEST_F(P2PTestConductor, GetGcmInit) { | 2040 TEST_F(P2PTestConductor, GetGcmInit) { |
2041 TestGcmNegotiation(true, false, kDefaultSrtpCryptoSuite); | 2041 TestGcmNegotiation(true, false, kDefaultSrtpCryptoSuite); |
2042 } | 2042 } |
2043 | 2043 |
2044 // Test that GCM isn't used if only the receiver supports it. | 2044 // Test that GCM isn't used if only the receiver supports it. |
2045 TEST_F(P2PTestConductor, GetGcmRecv) { | 2045 TEST_F(P2PTestConductor, GetGcmRecv) { |
2046 TestGcmNegotiation(false, true, kDefaultSrtpCryptoSuite); | 2046 TestGcmNegotiation(false, true, kDefaultSrtpCryptoSuite); |
2047 } | 2047 } |
2048 | 2048 |
| 2049 // Disabled due to flakiness, see http://crbug.com/webrtc/6776 |
| 2050 #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) |
| 2051 #define MAYBE_LocalP2PTestRtpDataChannel DISABLED_LocalP2PTestRtpDataChannel |
| 2052 #else |
| 2053 #define MAYBE_LocalP2PTestRtpDataChannel LocalP2PTestRtpDataChannel |
| 2054 #endif |
2049 // This test sets up a call between two parties with audio, video and an RTP | 2055 // This test sets up a call between two parties with audio, video and an RTP |
2050 // data channel. | 2056 // data channel. |
2051 TEST_F(P2PTestConductor, LocalP2PTestRtpDataChannel) { | 2057 TEST_F(P2PTestConductor, MAYBE_LocalP2PTestRtpDataChannel) { |
2052 FakeConstraints setup_constraints; | 2058 FakeConstraints setup_constraints; |
2053 setup_constraints.SetAllowRtpDataChannels(); | 2059 setup_constraints.SetAllowRtpDataChannels(); |
2054 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); | 2060 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); |
2055 initializing_client()->CreateDataChannel(); | 2061 initializing_client()->CreateDataChannel(); |
2056 LocalP2PTest(); | 2062 LocalP2PTest(); |
2057 ASSERT_TRUE(initializing_client()->data_channel() != nullptr); | 2063 ASSERT_TRUE(initializing_client()->data_channel() != nullptr); |
2058 ASSERT_TRUE(receiving_client()->data_channel() != nullptr); | 2064 ASSERT_TRUE(receiving_client()->data_channel() != nullptr); |
2059 EXPECT_TRUE_WAIT(initializing_client()->data_observer()->IsOpen(), | 2065 EXPECT_TRUE_WAIT(initializing_client()->data_observer()->IsOpen(), |
2060 kMaxWaitMs); | 2066 kMaxWaitMs); |
2061 EXPECT_TRUE_WAIT(receiving_client()->data_observer()->IsOpen(), | 2067 EXPECT_TRUE_WAIT(receiving_client()->data_observer()->IsOpen(), |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2194 SendRtpData(initializing_client()->data_channel(), data); | 2200 SendRtpData(initializing_client()->data_channel(), data); |
2195 | 2201 |
2196 // Wait a while to allow the sent data to arrive before an observer is | 2202 // Wait a while to allow the sent data to arrive before an observer is |
2197 // registered.. | 2203 // registered.. |
2198 rtc::Thread::Current()->ProcessMessages(100); | 2204 rtc::Thread::Current()->ProcessMessages(100); |
2199 | 2205 |
2200 MockDataChannelObserver new_observer(receiving_client()->data_channel()); | 2206 MockDataChannelObserver new_observer(receiving_client()->data_channel()); |
2201 EXPECT_EQ_WAIT(data, new_observer.last_message(), kMaxWaitMs); | 2207 EXPECT_EQ_WAIT(data, new_observer.last_message(), kMaxWaitMs); |
2202 } | 2208 } |
2203 | 2209 |
| 2210 // Disabled due to flakiness, see http://crbug.com/webrtc/6776 |
| 2211 #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) |
| 2212 #define MAYBE_LocalP2PTestReceiverDoesntSupportData DISABLED_LocalP2PTestReceive
rDoesntSupportData |
| 2213 #else |
| 2214 #define MAYBE_LocalP2PTestReceiverDoesntSupportData LocalP2PTestReceiverDoesntSu
pportData |
| 2215 #endif |
2204 // This test sets up a call between two parties with audio, video and but only | 2216 // This test sets up a call between two parties with audio, video and but only |
2205 // the initiating client support data. | 2217 // the initiating client support data. |
2206 TEST_F(P2PTestConductor, LocalP2PTestReceiverDoesntSupportData) { | 2218 TEST_F(P2PTestConductor, MAYBE_LocalP2PTestReceiverDoesntSupportData) { |
2207 FakeConstraints setup_constraints_1; | 2219 FakeConstraints setup_constraints_1; |
2208 setup_constraints_1.SetAllowRtpDataChannels(); | 2220 setup_constraints_1.SetAllowRtpDataChannels(); |
2209 // Must disable DTLS to make negotiation succeed. | 2221 // Must disable DTLS to make negotiation succeed. |
2210 setup_constraints_1.SetMandatory( | 2222 setup_constraints_1.SetMandatory( |
2211 MediaConstraintsInterface::kEnableDtlsSrtp, false); | 2223 MediaConstraintsInterface::kEnableDtlsSrtp, false); |
2212 FakeConstraints setup_constraints_2; | 2224 FakeConstraints setup_constraints_2; |
2213 setup_constraints_2.SetMandatory( | 2225 setup_constraints_2.SetMandatory( |
2214 MediaConstraintsInterface::kEnableDtlsSrtp, false); | 2226 MediaConstraintsInterface::kEnableDtlsSrtp, false); |
2215 ASSERT_TRUE(CreateTestClients(&setup_constraints_1, &setup_constraints_2)); | 2227 ASSERT_TRUE(CreateTestClients(&setup_constraints_1, &setup_constraints_2)); |
2216 initializing_client()->CreateDataChannel(); | 2228 initializing_client()->CreateDataChannel(); |
2217 LocalP2PTest(); | 2229 LocalP2PTest(); |
2218 EXPECT_TRUE(initializing_client()->data_channel() != nullptr); | 2230 EXPECT_TRUE(initializing_client()->data_channel() != nullptr); |
2219 EXPECT_FALSE(receiving_client()->data_channel()); | 2231 EXPECT_FALSE(receiving_client()->data_channel()); |
2220 EXPECT_FALSE(initializing_client()->data_observer()->IsOpen()); | 2232 EXPECT_FALSE(initializing_client()->data_observer()->IsOpen()); |
2221 } | 2233 } |
2222 | 2234 |
| 2235 // Disabled due to flakiness, see http://crbug.com/webrtc/6776 |
| 2236 #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) |
| 2237 #define MAYBE_AddDataChannelAfterRenegotiation DISABLED_AddDataChannelAfterReneg
otiation |
| 2238 #else |
| 2239 #define MAYBE_AddDataChannelAfterRenegotiation AddDataChannelAfterRenegotiation |
| 2240 #endif |
2223 // This test sets up a call between two parties with audio, video. When audio | 2241 // This test sets up a call between two parties with audio, video. When audio |
2224 // and video is setup and flowing and data channel is negotiated. | 2242 // and video is setup and flowing and data channel is negotiated. |
2225 TEST_F(P2PTestConductor, AddDataChannelAfterRenegotiation) { | 2243 TEST_F(P2PTestConductor, MAYBE_AddDataChannelAfterRenegotiation) { |
2226 FakeConstraints setup_constraints; | 2244 FakeConstraints setup_constraints; |
2227 setup_constraints.SetAllowRtpDataChannels(); | 2245 setup_constraints.SetAllowRtpDataChannels(); |
2228 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); | 2246 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); |
2229 LocalP2PTest(); | 2247 LocalP2PTest(); |
2230 initializing_client()->CreateDataChannel(); | 2248 initializing_client()->CreateDataChannel(); |
2231 // Send new offer and answer. | 2249 // Send new offer and answer. |
2232 initializing_client()->Negotiate(); | 2250 initializing_client()->Negotiate(); |
2233 ASSERT_TRUE(initializing_client()->data_channel() != nullptr); | 2251 ASSERT_TRUE(initializing_client()->data_channel() != nullptr); |
2234 ASSERT_TRUE(receiving_client()->data_channel() != nullptr); | 2252 ASSERT_TRUE(receiving_client()->data_channel() != nullptr); |
2235 EXPECT_TRUE_WAIT(initializing_client()->data_observer()->IsOpen(), | 2253 EXPECT_TRUE_WAIT(initializing_client()->data_observer()->IsOpen(), |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2784 server.urls.push_back("turn:hostname2"); | 2802 server.urls.push_back("turn:hostname2"); |
2785 servers.push_back(server); | 2803 servers.push_back(server); |
2786 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); | 2804 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); |
2787 EXPECT_EQ(2U, turn_servers_.size()); | 2805 EXPECT_EQ(2U, turn_servers_.size()); |
2788 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); | 2806 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); |
2789 } | 2807 } |
2790 | 2808 |
2791 #endif // if !defined(THREAD_SANITIZER) | 2809 #endif // if !defined(THREAD_SANITIZER) |
2792 | 2810 |
2793 } // namespace | 2811 } // namespace |
OLD | NEW |