Commit 96d8be10 authored by Fergus Dall's avatar Fergus Dall Committed by Commit Bot

Sheriff: Disable many weblayer tests on Windows

ErrorPageBrowserTest.404WithEmptyBody
ErrorPageBrowserTest.NameNotResolved
NavigationBrowserTest.HttpClientError
NavigationBrowserTest.HttpConnectivityError
NavigationBrowserTest.HttpServerError
NavigationBrowserTest.NoError
NavigationBrowserTest.SSLError
SSLBrowserTest.NavigateAway
SSLBrowserTest.Proceed
SSLBrowserTest.Reload
SSLBrowserTest.TakeMeBack
SSLBrowserTest.TakeMeBackEmptyNavigationHistory
WebLayerBrowserTest.Basic
WebLayerWebUIBrowserTest.WebUI

Bug: 1034764

TBR=weblayer-dev@chromium.org

Change-Id: I3b25c2ecca3ca123e5e40d47f78c6f6f1f33440d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1970299Reviewed-by: default avatarFergus Dall <sidereal@google.com>
Commit-Queue: Fergus Dall <sidereal@google.com>
Cr-Commit-Position: refs/heads/master@{#725333}
parent 79199032
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "weblayer/test/weblayer_browser_test.h" #include "weblayer/test/weblayer_browser_test.h"
#include "base/macros.h" #include "base/macros.h"
#include "build/build_config.h"
#include "net/test/url_request/url_request_failed_job.h" #include "net/test/url_request/url_request_failed_job.h"
#include "weblayer/shell/browser/shell.h" #include "weblayer/shell/browser/shell.h"
#include "weblayer/test/weblayer_browser_test_utils.h" #include "weblayer/test/weblayer_browser_test_utils.h"
...@@ -18,6 +19,8 @@ namespace weblayer { ...@@ -18,6 +19,8 @@ namespace weblayer {
using ErrorPageBrowserTest = WebLayerBrowserTest; using ErrorPageBrowserTest = WebLayerBrowserTest;
// Disabled on Windows, see crbug.com/1034764
#if !defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(ErrorPageBrowserTest, NameNotResolved) { IN_PROC_BROWSER_TEST_F(ErrorPageBrowserTest, NameNotResolved) {
GURL error_page_url = GURL error_page_url =
net::URLRequestFailedJob::GetMockHttpUrl(net::ERR_NAME_NOT_RESOLVED); net::URLRequestFailedJob::GetMockHttpUrl(net::ERR_NAME_NOT_RESOLVED);
...@@ -41,5 +44,6 @@ IN_PROC_BROWSER_TEST_F(ErrorPageBrowserTest, 404WithEmptyBody) { ...@@ -41,5 +44,6 @@ IN_PROC_BROWSER_TEST_F(ErrorPageBrowserTest, 404WithEmptyBody) {
NavigateAndWaitForFailure(error_page_url, shell()); NavigateAndWaitForFailure(error_page_url, shell());
} }
#endif // !defined(OS_WIN)
} // namespace weblayer } // namespace weblayer
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "weblayer/test/weblayer_browser_test.h" #include "weblayer/test/weblayer_browser_test.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "build/build_config.h"
#include "content/public/test/url_loader_interceptor.h" #include "content/public/test/url_loader_interceptor.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "weblayer/public/navigation.h" #include "weblayer/public/navigation.h"
...@@ -67,6 +68,8 @@ class OneShotNavigationObserver : public NavigationObserver { ...@@ -67,6 +68,8 @@ class OneShotNavigationObserver : public NavigationObserver {
using NavigationBrowserTest = WebLayerBrowserTest; using NavigationBrowserTest = WebLayerBrowserTest;
// Disabled on Windows, see crbug.com/1034764
#if !defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, NoError) { IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, NoError) {
EXPECT_TRUE(embedded_test_server()->Start()); EXPECT_TRUE(embedded_test_server()->Start());
...@@ -147,5 +150,6 @@ IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, HttpConnectivityError) { ...@@ -147,5 +150,6 @@ IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, HttpConnectivityError) {
EXPECT_EQ(observer.load_error(), Navigation::kConnectivityError); EXPECT_EQ(observer.load_error(), Navigation::kConnectivityError);
EXPECT_EQ(observer.navigation_state(), NavigationState::kFailed); EXPECT_EQ(observer.navigation_state(), NavigationState::kFailed);
} }
#endif // !defined(OS_WIN)
} // namespace weblayer } // namespace weblayer
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/optional.h" #include "base/optional.h"
#include "build/build_config.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "weblayer/shell/browser/shell.h" #include "weblayer/shell/browser/shell.h"
#include "weblayer/test/interstitial_utils.h" #include "weblayer/test/interstitial_utils.h"
...@@ -126,6 +127,8 @@ class SSLBrowserTest : public WebLayerBrowserTest { ...@@ -126,6 +127,8 @@ class SSLBrowserTest : public WebLayerBrowserTest {
DISALLOW_COPY_AND_ASSIGN(SSLBrowserTest); DISALLOW_COPY_AND_ASSIGN(SSLBrowserTest);
}; };
// Disabled on Windows, see crbug.com/1034764
#if !defined(OS_WIN)
// Tests clicking "take me back" on the interstitial page. // Tests clicking "take me back" on the interstitial page.
IN_PROC_BROWSER_TEST_F(SSLBrowserTest, TakeMeBack) { IN_PROC_BROWSER_TEST_F(SSLBrowserTest, TakeMeBack) {
NavigateToOkPage(); NavigateToOkPage();
...@@ -196,5 +199,6 @@ IN_PROC_BROWSER_TEST_F(SSLBrowserTest, NavigateAway) { ...@@ -196,5 +199,6 @@ IN_PROC_BROWSER_TEST_F(SSLBrowserTest, NavigateAway) {
NavigateToPageWithSslErrorExpectBlocked(); NavigateToPageWithSslErrorExpectBlocked();
NavigateToOtherOkPage(); NavigateToOtherOkPage();
} }
#endif // !defined(OS_WIN)
} // namespace weblayer } // namespace weblayer
...@@ -4,12 +4,15 @@ ...@@ -4,12 +4,15 @@
#include "weblayer/test/weblayer_browser_test.h" #include "weblayer/test/weblayer_browser_test.h"
#include "build/build_config.h"
#include "weblayer/test/weblayer_browser_test_utils.h" #include "weblayer/test/weblayer_browser_test_utils.h"
namespace weblayer { namespace weblayer {
using WebLayerWebUIBrowserTest = WebLayerBrowserTest; using WebLayerWebUIBrowserTest = WebLayerBrowserTest;
// Disabled on Windows, see crbug.com/1034764
#if !defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(WebLayerWebUIBrowserTest, WebUI) { IN_PROC_BROWSER_TEST_F(WebLayerWebUIBrowserTest, WebUI) {
NavigateAndWaitForCompletion(GURL("chrome://weblayer"), shell()); NavigateAndWaitForCompletion(GURL("chrome://weblayer"), shell());
base::RunLoop run_loop; base::RunLoop run_loop;
...@@ -25,5 +28,6 @@ IN_PROC_BROWSER_TEST_F(WebLayerWebUIBrowserTest, WebUI) { ...@@ -25,5 +28,6 @@ IN_PROC_BROWSER_TEST_F(WebLayerWebUIBrowserTest, WebUI) {
EXPECT_TRUE(result); EXPECT_TRUE(result);
#endif #endif
} }
#endif // !defined(OS_WIN)
} // namespace weblayer } // namespace weblayer
...@@ -4,16 +4,20 @@ ...@@ -4,16 +4,20 @@
#include "weblayer/test/weblayer_browser_test.h" #include "weblayer/test/weblayer_browser_test.h"
#include "build/build_config.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "weblayer/test/weblayer_browser_test_utils.h" #include "weblayer/test/weblayer_browser_test_utils.h"
namespace weblayer { namespace weblayer {
// Disabled on Windows, see crbug.com/1034764
#if !defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(WebLayerBrowserTest, Basic) { IN_PROC_BROWSER_TEST_F(WebLayerBrowserTest, Basic) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
GURL url = embedded_test_server()->GetURL("/simple_page.html"); GURL url = embedded_test_server()->GetURL("/simple_page.html");
NavigateAndWaitForCompletion(url, shell()); NavigateAndWaitForCompletion(url, shell());
} }
#endif // !defined(OS_WIN)
} // namespace weblayer } // namespace weblayer
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment