Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Side by Side Diff: talk/app/webrtc/peerconnectionendtoend_unittest.cc

Issue 1499483002: Disable PeerConnectionEndToEndTest.Call on Mac. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 220 // Disabled for TSan v2, see
221 // https://bugs.chromium.org/p/webrtc/issues/detail?id=4719 for details. 221 // https://bugs.chromium.org/p/webrtc/issues/detail?id=4719 for details.
222 #if !defined(THREAD_SANITIZER) 222 // Disabled for Mac, see
223 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5231 for details.
224 #if !defined(THREAD_SANITIZER) && !defined(WEBRTC_MAC)
223 TEST_F(PeerConnectionEndToEndTest, Call) { 225 TEST_F(PeerConnectionEndToEndTest, Call) {
224 CreatePcs(); 226 CreatePcs();
225 GetAndAddUserMedia(); 227 GetAndAddUserMedia();
226 Negotiate(); 228 Negotiate();
227 WaitForCallEstablished(); 229 WaitForCallEstablished();
228 } 230 }
229 #endif // if !defined(THREAD_SANITIZER) 231 #endif // if !defined(THREAD_SANITIZER) && !defined(WEBRTC_MAC)
230 232
231 // Disabled per b/14899892 233 // Disabled per b/14899892
232 TEST_F(PeerConnectionEndToEndTest, DISABLED_CallWithLegacySdp) { 234 TEST_F(PeerConnectionEndToEndTest, DISABLED_CallWithLegacySdp) {
233 FakeConstraints pc_constraints; 235 FakeConstraints pc_constraints;
234 pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, 236 pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp,
235 false); 237 false);
236 CreatePcs(&pc_constraints); 238 CreatePcs(&pc_constraints);
237 GetAndAddUserMedia(); 239 GetAndAddUserMedia();
238 Negotiate(); 240 Negotiate();
239 WaitForCallEstablished(); 241 WaitForCallEstablished();
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 0); 395 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 0);
394 396
395 // Create a new channel and ensure it works after closing the previous one. 397 // Create a new channel and ensure it works after closing the previous one.
396 caller_dc = caller_->CreateDataChannel("data2", init); 398 caller_dc = caller_->CreateDataChannel("data2", init);
397 399
398 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 1); 400 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 1);
399 TestDataChannelSendAndReceive(caller_dc, callee_signaled_data_channels_[1]); 401 TestDataChannelSendAndReceive(caller_dc, callee_signaled_data_channels_[1]);
400 402
401 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 1); 403 CloseDataChannels(caller_dc, callee_signaled_data_channels_, 1);
402 } 404 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698