OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5231 for details. | 223 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5231 for details. |
224 #if !defined(THREAD_SANITIZER) && !defined(WEBRTC_MAC) | 224 #if !defined(THREAD_SANITIZER) && !defined(WEBRTC_MAC) |
225 TEST_F(PeerConnectionEndToEndTest, Call) { | 225 TEST_F(PeerConnectionEndToEndTest, Call) { |
226 CreatePcs(); | 226 CreatePcs(); |
227 GetAndAddUserMedia(); | 227 GetAndAddUserMedia(); |
228 Negotiate(); | 228 Negotiate(); |
229 WaitForCallEstablished(); | 229 WaitForCallEstablished(); |
230 } | 230 } |
231 #endif // if !defined(THREAD_SANITIZER) && !defined(WEBRTC_MAC) | 231 #endif // if !defined(THREAD_SANITIZER) && !defined(WEBRTC_MAC) |
232 | 232 |
233 // Disabled per b/14899892 | 233 TEST_F(PeerConnectionEndToEndTest, CallWithLegacySdp) { |
234 TEST_F(PeerConnectionEndToEndTest, DISABLED_CallWithLegacySdp) { | |
235 FakeConstraints pc_constraints; | 234 FakeConstraints pc_constraints; |
236 pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, | 235 pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, |
237 false); | 236 false); |
238 CreatePcs(&pc_constraints); | 237 CreatePcs(&pc_constraints); |
239 GetAndAddUserMedia(); | 238 GetAndAddUserMedia(); |
240 Negotiate(); | 239 Negotiate(); |
241 WaitForCallEstablished(); | 240 WaitForCallEstablished(); |
242 } | 241 } |
243 | 242 |
244 // Verifies that a DataChannel created before the negotiation can transition to | 243 // Verifies that a DataChannel created before the negotiation can transition to |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 0); | 394 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 0); |
396 | 395 |
397 // Create a new channel and ensure it works after closing the previous one. | 396 // Create a new channel and ensure it works after closing the previous one. |
398 caller_dc = caller_->CreateDataChannel("data2", init); | 397 caller_dc = caller_->CreateDataChannel("data2", init); |
399 | 398 |
400 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 1); | 399 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 1); |
401 TestDataChannelSendAndReceive(caller_dc, callee_signaled_data_channels_[1]); | 400 TestDataChannelSendAndReceive(caller_dc, callee_signaled_data_channels_[1]); |
402 | 401 |
403 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 1); | 402 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 1); |
404 } | 403 } |
OLD | NEW |