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

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

Issue 2485953002: Reenable P2P test case and remove outdated TODO (Closed)
Patch Set: Created 4 years, 1 month 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 * 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 1809 matching lines...) Expand 10 before | Expand all | Expand 10 after
1820 ASSERT_TRUE(CreateTestClients()); 1820 ASSERT_TRUE(CreateTestClients());
1821 receiving_client()->RemoveMsidFromReceivedSdp(true); 1821 receiving_client()->RemoveMsidFromReceivedSdp(true);
1822 // TODO(perkj): Currently there is a bug that cause audio to stop playing if 1822 // TODO(perkj): Currently there is a bug that cause audio to stop playing if
1823 // audio and video is muxed when MSID is disabled. Remove 1823 // audio and video is muxed when MSID is disabled. Remove
1824 // SetRemoveBundleFromSdp once 1824 // SetRemoveBundleFromSdp once
1825 // https://code.google.com/p/webrtc/issues/detail?id=1193 is fixed. 1825 // https://code.google.com/p/webrtc/issues/detail?id=1193 is fixed.
1826 receiving_client()->RemoveBundleFromReceivedSdp(true); 1826 receiving_client()->RemoveBundleFromReceivedSdp(true);
1827 LocalP2PTest(); 1827 LocalP2PTest();
1828 } 1828 }
1829 1829
1830 // This test sets up a Jsep call between two parties and the initiating peer 1830 TEST_F(P2PTestConductor, LocalP2PTestTwoStreams) {
1831 // sends two steams.
1832 // TODO(perkj): Disabled due to
1833 // https://code.google.com/p/webrtc/issues/detail?id=1454
1834 TEST_F(P2PTestConductor, DISABLED_LocalP2PTestTwoStreams) {
1835 ASSERT_TRUE(CreateTestClients()); 1831 ASSERT_TRUE(CreateTestClients());
1836 // Set optional video constraint to max 320pixels to decrease CPU usage. 1832 // Set optional video constraint to max 320pixels to decrease CPU usage.
1837 FakeConstraints constraint; 1833 FakeConstraints constraint;
1838 constraint.SetOptionalMaxWidth(320); 1834 constraint.SetOptionalMaxWidth(320);
1839 SetVideoConstraints(constraint, constraint); 1835 SetVideoConstraints(constraint, constraint);
1840 initializing_client()->AddMediaStream(true, true); 1836 initializing_client()->AddMediaStream(true, true);
1841 initializing_client()->AddMediaStream(false, true); 1837 initializing_client()->AddMediaStream(false, true);
1842 ASSERT_EQ(2u, initializing_client()->NumberOfLocalMediaStreams()); 1838 ASSERT_EQ(2u, initializing_client()->NumberOfLocalMediaStreams());
1843 LocalP2PTest(); 1839 LocalP2PTest();
1844 EXPECT_EQ(2u, receiving_client()->number_of_remote_streams()); 1840 EXPECT_EQ(2u, receiving_client()->number_of_remote_streams());
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
2778 server.urls.push_back("turn:hostname2"); 2774 server.urls.push_back("turn:hostname2");
2779 servers.push_back(server); 2775 servers.push_back(server);
2780 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); 2776 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
2781 EXPECT_EQ(2U, turn_servers_.size()); 2777 EXPECT_EQ(2U, turn_servers_.size());
2782 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); 2778 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
2783 } 2779 }
2784 2780
2785 #endif // if !defined(THREAD_SANITIZER) 2781 #endif // if !defined(THREAD_SANITIZER)
2786 2782
2787 } // namespace 2783 } // namespace
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