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

Unified Diff: chrome/browser/media/webrtc_video_quality_browsertest.cc

Issue 2008583004: Disabling HD video quality tests on win7. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/webrtc_video_quality_browsertest.cc
diff --git a/chrome/browser/media/webrtc_video_quality_browsertest.cc b/chrome/browser/media/webrtc_video_quality_browsertest.cc
index 566265371e4d52b54fe2d70b570d1e63c9e40183..46d79c84edbec6278e8b8b63bf4b35c1f28dfc37 100644
--- a/chrome/browser/media/webrtc_video_quality_browsertest.cc
+++ b/chrome/browser/media/webrtc_video_quality_browsertest.cc
@@ -39,6 +39,10 @@
#include "testing/perf/perf_test.h"
#include "ui/gl/gl_switches.h"
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
namespace {
std::string MakeLabel(const char* test_name, const std::string& video_codec) {
std::string codec_label = video_codec.empty() ? "" : "_" + video_codec;
@@ -280,6 +284,15 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase,
}
void TestVideoQuality(const std::string& video_codec) {
+#if defined(OS_WIN)
+ // Too slow for bots with bad GL config: see http://crbug.com/613947.
+ bool is_hd = test_config_.width >= 1024;
+ if (is_hd && base::win::GetVersion() == base::win::VERSION_WIN7) {
+ LOG(WARNING) << "Skipping HD test on Win7.";
+ return;
+ }
+#endif
+
ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 150)
<< "This is a long-running test; you must specify "
"--ui-test-action-max-timeout to have a value of at least 150000.";
« 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