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

Unified Diff: chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc

Issue 2594773002: Disable failing resolutions for Webcam test on Win8 bot (Closed)
Patch Set: Added missing namespace qualifiers Created 4 years 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/webrtc_webcam_browsertest.cc
diff --git a/chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc b/chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc
index 49665dd84fd713bf8293da30e28507aada04e955..003dd20acc84073a3c964139fd631a9085a1eeec 100644
--- a/chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc
@@ -18,6 +18,10 @@
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gtest/include/gtest/gtest-param-test.h"
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
static const char kMainWebrtcTestHtmlPage[] =
"/webrtc/webrtc_jsep01_test.html";
@@ -89,6 +93,17 @@ IN_PROC_BROWSER_TEST_P(WebRtcWebcamBrowserTest,
GetUserMediaAndGetStreamSize(tab, kVideoCallConstraintsVGA));
EXPECT_EQ("640x360",
GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints360p));
+
+// TODO(chfremer): Reenable these tests when https://crbug.com/676041 is
+// resolved.
+#if defined(OS_WIN)
+ auto win_version = base::win::GetVersion();
+ if (win_version == base::win::VERSION_WIN8 ||
+ win_version == base::win::VERSION_WIN8_1) {
+ return;
+ }
+#endif
+
EXPECT_EQ("1280x720",
GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p));
EXPECT_EQ("1920x1080",
« 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