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

Side by Side Diff: content/browser/media/webrtc_getusermedia_browsertest.cc

Issue 320103002: Disable flaky test TwoGetUserMediaWithFirstHdSecondVga (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/debug/trace_event_impl.h" 6 #include "base/debug/trace_event_impl.h"
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/test/trace_event_analyzer.h" 9 #include "base/test/trace_event_analyzer.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, 455 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
456 TwoGetUserMediaWithSecondVideoCropped) { 456 TwoGetUserMediaWithSecondVideoCropped) {
457 std::string constraints1 = "{video: true}"; 457 std::string constraints1 = "{video: true}";
458 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; 458 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}";
459 std::string expected_result = "w=640:h=480-w=640:h=360"; 459 std::string expected_result = "w=640:h=480-w=640:h=360";
460 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, 460 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
461 expected_result); 461 expected_result);
462 } 462 }
463 463
464 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, 464 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
465 TwoGetUserMediaWithFirstHdSecondVga) { 465 DISABLED_TwoGetUserMediaWithFirstHdSecondVga) {
466 std::string constraints1 = 466 std::string constraints1 =
467 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}"; 467 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}";
468 std::string constraints2 = 468 std::string constraints2 =
469 "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}"; 469 "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
470 std::string expected_result = "w=1280:h=720-w=640:h=480"; 470 std::string expected_result = "w=1280:h=720-w=640:h=480";
471 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, 471 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
472 expected_result); 472 expected_result);
473 } 473 }
474 474
475 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, 475 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 {640, 640, 360, 360, 10, 30}, 598 {640, 640, 360, 360, 10, 30},
599 {640, 640, 480, 480, 10, 30}, 599 {640, 640, 480, 480, 10, 30},
600 {960, 960, 720, 720, 10, 30}, 600 {960, 960, 720, 720, 10, 30},
601 {1280, 1280, 720, 720, 10, 30}}; 601 {1280, 1280, 720, 720, 10, 30}};
602 602
603 INSTANTIATE_TEST_CASE_P(UserMedia, 603 INSTANTIATE_TEST_CASE_P(UserMedia,
604 WebRtcConstraintsBrowserTest, 604 WebRtcConstraintsBrowserTest,
605 testing::ValuesIn(kAllUserMediaSizes)); 605 testing::ValuesIn(kAllUserMediaSizes));
606 606
607 } // namespace content 607 } // namespace content
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