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

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

Issue 1236023010: In PeerConnectionTestWrapper, put audio input on a separate thread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: resolving patch conflicts due to splitting this CL Created 5 years, 4 months 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
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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 kMaxWait); 261 kMaxWait);
262 } 262 }
263 263
264 protected: 264 protected:
265 rtc::scoped_refptr<PeerConnectionTestWrapper> caller_; 265 rtc::scoped_refptr<PeerConnectionTestWrapper> caller_;
266 rtc::scoped_refptr<PeerConnectionTestWrapper> callee_; 266 rtc::scoped_refptr<PeerConnectionTestWrapper> callee_;
267 DataChannelList caller_signaled_data_channels_; 267 DataChannelList caller_signaled_data_channels_;
268 DataChannelList callee_signaled_data_channels_; 268 DataChannelList callee_signaled_data_channels_;
269 }; 269 };
270 270
271 // Disable for TSan v2, see 271 TEST_F(PeerConnectionEndToEndTest, Call) {
272 // https://code.google.com/p/webrtc/issues/detail?id=1205 for details.
273 #if !defined(THREAD_SANITIZER)
274
275 // Flaky on Windows. Disabled per issue 4464.
276 #ifdef WEBRTC_WIN
277 #define MAYBE_Call DISABLED_Call
278 #else
279 #define MAYBE_Call Call
280 #endif
281 TEST_F(PeerConnectionEndToEndTest, MAYBE_Call) {
282 CreatePcs(); 272 CreatePcs();
283 GetAndAddUserMedia(); 273 GetAndAddUserMedia();
284 Negotiate(); 274 Negotiate();
285 WaitForCallEstablished(); 275 WaitForCallEstablished();
286 } 276 }
287 277
288 // Disabled per b/14899892 278 // Disabled per b/14899892
289 TEST_F(PeerConnectionEndToEndTest, DISABLED_CallWithLegacySdp) { 279 TEST_F(PeerConnectionEndToEndTest, DISABLED_CallWithLegacySdp) {
290 FakeConstraints pc_constraints; 280 FakeConstraints pc_constraints;
291 pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, 281 pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp,
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 410
421 caller_dc_1->Send(webrtc::DataBuffer(message_1)); 411 caller_dc_1->Send(webrtc::DataBuffer(message_1));
422 EXPECT_EQ_WAIT(message_1, dc_1_observer->last_message(), kMaxWait); 412 EXPECT_EQ_WAIT(message_1, dc_1_observer->last_message(), kMaxWait);
423 413
424 caller_dc_2->Send(webrtc::DataBuffer(message_2)); 414 caller_dc_2->Send(webrtc::DataBuffer(message_2));
425 EXPECT_EQ_WAIT(message_2, dc_2_observer->last_message(), kMaxWait); 415 EXPECT_EQ_WAIT(message_2, dc_2_observer->last_message(), kMaxWait);
426 416
427 EXPECT_EQ(1U, dc_1_observer->received_message_count()); 417 EXPECT_EQ(1U, dc_1_observer->received_message_count());
428 EXPECT_EQ(1U, dc_2_observer->received_message_count()); 418 EXPECT_EQ(1U, dc_2_observer->received_message_count());
429 } 419 }
430 #endif // if !defined(THREAD_SANITIZER)
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnection_unittest.cc ('k') | talk/app/webrtc/test/fakeaudiocapturemodule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698