| 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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 | |
| 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. | 271 // Flaky on Windows. Disabled per issue 4464. |
| 276 #ifdef WEBRTC_WIN | 272 #ifdef WEBRTC_WIN |
| 277 #define MAYBE_Call DISABLED_Call | 273 #define MAYBE_Call DISABLED_Call |
| 278 #else | 274 #else |
| 279 #define MAYBE_Call Call | 275 #define MAYBE_Call Call |
| 280 #endif | 276 #endif |
| 281 TEST_F(PeerConnectionEndToEndTest, MAYBE_Call) { | 277 TEST_F(PeerConnectionEndToEndTest, MAYBE_Call) { |
| 282 CreatePcs(); | 278 CreatePcs(); |
| 283 GetAndAddUserMedia(); | 279 GetAndAddUserMedia(); |
| 284 Negotiate(); | 280 Negotiate(); |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 | 416 |
| 421 caller_dc_1->Send(webrtc::DataBuffer(message_1)); | 417 caller_dc_1->Send(webrtc::DataBuffer(message_1)); |
| 422 EXPECT_EQ_WAIT(message_1, dc_1_observer->last_message(), kMaxWait); | 418 EXPECT_EQ_WAIT(message_1, dc_1_observer->last_message(), kMaxWait); |
| 423 | 419 |
| 424 caller_dc_2->Send(webrtc::DataBuffer(message_2)); | 420 caller_dc_2->Send(webrtc::DataBuffer(message_2)); |
| 425 EXPECT_EQ_WAIT(message_2, dc_2_observer->last_message(), kMaxWait); | 421 EXPECT_EQ_WAIT(message_2, dc_2_observer->last_message(), kMaxWait); |
| 426 | 422 |
| 427 EXPECT_EQ(1U, dc_1_observer->received_message_count()); | 423 EXPECT_EQ(1U, dc_1_observer->received_message_count()); |
| 428 EXPECT_EQ(1U, dc_2_observer->received_message_count()); | 424 EXPECT_EQ(1U, dc_2_observer->received_message_count()); |
| 429 } | 425 } |
| 430 #endif // if !defined(THREAD_SANITIZER) | |
| OLD | NEW |