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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 kMaxWait); | 210 kMaxWait); |
211 } | 211 } |
212 | 212 |
213 protected: | 213 protected: |
214 rtc::scoped_refptr<PeerConnectionTestWrapper> caller_; | 214 rtc::scoped_refptr<PeerConnectionTestWrapper> caller_; |
215 rtc::scoped_refptr<PeerConnectionTestWrapper> callee_; | 215 rtc::scoped_refptr<PeerConnectionTestWrapper> callee_; |
216 DataChannelList caller_signaled_data_channels_; | 216 DataChannelList caller_signaled_data_channels_; |
217 DataChannelList callee_signaled_data_channels_; | 217 DataChannelList callee_signaled_data_channels_; |
218 }; | 218 }; |
219 | 219 |
| 220 // Disabled for TSan v2, see |
| 221 // https://bugs.chromium.org/p/webrtc/issues/detail?id=4719 for details. |
| 222 #if !defined(THREAD_SANITIZER) |
220 TEST_F(PeerConnectionEndToEndTest, Call) { | 223 TEST_F(PeerConnectionEndToEndTest, Call) { |
221 CreatePcs(); | 224 CreatePcs(); |
222 GetAndAddUserMedia(); | 225 GetAndAddUserMedia(); |
223 Negotiate(); | 226 Negotiate(); |
224 WaitForCallEstablished(); | 227 WaitForCallEstablished(); |
225 } | 228 } |
| 229 #endif // if !defined(THREAD_SANITIZER) |
226 | 230 |
227 // Disabled per b/14899892 | 231 // Disabled per b/14899892 |
228 TEST_F(PeerConnectionEndToEndTest, DISABLED_CallWithLegacySdp) { | 232 TEST_F(PeerConnectionEndToEndTest, DISABLED_CallWithLegacySdp) { |
229 FakeConstraints pc_constraints; | 233 FakeConstraints pc_constraints; |
230 pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, | 234 pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, |
231 false); | 235 false); |
232 CreatePcs(&pc_constraints); | 236 CreatePcs(&pc_constraints); |
233 GetAndAddUserMedia(); | 237 GetAndAddUserMedia(); |
234 Negotiate(); | 238 Negotiate(); |
235 WaitForCallEstablished(); | 239 WaitForCallEstablished(); |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 0); | 393 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 0); |
390 | 394 |
391 // Create a new channel and ensure it works after closing the previous one. | 395 // Create a new channel and ensure it works after closing the previous one. |
392 caller_dc = caller_->CreateDataChannel("data2", init); | 396 caller_dc = caller_->CreateDataChannel("data2", init); |
393 | 397 |
394 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 1); | 398 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 1); |
395 TestDataChannelSendAndReceive(caller_dc, callee_signaled_data_channels_[1]); | 399 TestDataChannelSendAndReceive(caller_dc, callee_signaled_data_channels_[1]); |
396 | 400 |
397 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 1); | 401 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 1); |
398 } | 402 } |
OLD | NEW |