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

Side by Side Diff: webrtc/api/peerconnection_unittest.cc

Issue 1837393002: Re-enabling tests that were disabled for Windows debug builds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « no previous file | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | 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 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 1828 matching lines...) Expand 10 before | Expand all | Expand 10 after
1839 ASSERT_TRUE(receiving_client()->data_channel() != nullptr); 1839 ASSERT_TRUE(receiving_client()->data_channel() != nullptr);
1840 EXPECT_TRUE_WAIT(initializing_client()->data_observer()->IsOpen(), 1840 EXPECT_TRUE_WAIT(initializing_client()->data_observer()->IsOpen(),
1841 kMaxWaitMs); 1841 kMaxWaitMs);
1842 EXPECT_TRUE_WAIT(receiving_client()->data_observer()->IsOpen(), 1842 EXPECT_TRUE_WAIT(receiving_client()->data_observer()->IsOpen(),
1843 kMaxWaitMs); 1843 kMaxWaitMs);
1844 } 1844 }
1845 1845
1846 // This test sets up a Jsep call with SCTP DataChannel and verifies the 1846 // This test sets up a Jsep call with SCTP DataChannel and verifies the
1847 // negotiation is completed without error. 1847 // negotiation is completed without error.
1848 #ifdef HAVE_SCTP 1848 #ifdef HAVE_SCTP
1849 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 1849 TEST_F(P2PTestConductor, CreateOfferWithSctpDataChannel) {
1850 #if defined(WEBRTC_WIN) && defined(_DEBUG)
1851 #define MAYBE_CreateOfferWithSctpDataChannel \
1852 DISABLED_CreateOfferWithSctpDataChannel
1853 #else
1854 #define MAYBE_CreateOfferWithSctpDataChannel CreateOfferWithSctpDataChannel
1855 #endif
1856 TEST_F(P2PTestConductor, MAYBE_CreateOfferWithSctpDataChannel) {
1857 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); 1850 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp);
1858 FakeConstraints constraints; 1851 FakeConstraints constraints;
1859 constraints.SetMandatory( 1852 constraints.SetMandatory(
1860 MediaConstraintsInterface::kEnableDtlsSrtp, true); 1853 MediaConstraintsInterface::kEnableDtlsSrtp, true);
1861 ASSERT_TRUE(CreateTestClients(&constraints, &constraints)); 1854 ASSERT_TRUE(CreateTestClients(&constraints, &constraints));
1862 initializing_client()->CreateDataChannel(); 1855 initializing_client()->CreateDataChannel();
1863 initializing_client()->Negotiate(false, false); 1856 initializing_client()->Negotiate(false, false);
1864 } 1857 }
1865 #endif 1858 #endif
1866 1859
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
2162 server.urls.push_back("turn:hostname2"); 2155 server.urls.push_back("turn:hostname2");
2163 servers.push_back(server); 2156 servers.push_back(server);
2164 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); 2157 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
2165 EXPECT_EQ(2U, turn_servers_.size()); 2158 EXPECT_EQ(2U, turn_servers_.size());
2166 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); 2159 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
2167 } 2160 }
2168 2161
2169 #endif // if !defined(THREAD_SANITIZER) 2162 #endif // if !defined(THREAD_SANITIZER)
2170 2163
2171 } // namespace 2164 } // namespace
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698