diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 16:41:30 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 16:41:30 +0000 |
| commit | b6ab53391f976024322d2372b367c7b959b77ec9 (patch) | |
| tree | e7357404a7dc8244a7f8ad803018ec3aae84d099 | |
| parent | 298500adef9af0d3dd2716045fdf666cd16ef6fe (diff) | |
| download | chromium_src-b6ab53391f976024322d2372b367c7b959b77ec9.zip chromium_src-b6ab53391f976024322d2372b367c7b959b77ec9.tar.gz chromium_src-b6ab53391f976024322d2372b367c7b959b77ec9.tar.bz2 | |
Disabling flaky tests.
BUG=158130,176122
TBR=vabr,fsamuel
Review URL: https://codereview.chromium.org/12253036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182477 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/web_view_browsertest.cc | 9 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/extensions/web_view_browsertest.cc b/chrome/browser/extensions/web_view_browsertest.cc index 2282581..e634f50 100644 --- a/chrome/browser/extensions/web_view_browsertest.cc +++ b/chrome/browser/extensions/web_view_browsertest.cc @@ -252,13 +252,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Shim) { ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/shim")) << message_; } -// http://crbug.com/176122: This test is flaky on Linux. -#if defined(OS_LINUX) -#define MAYBE_ShimSrcAttribute DISABLED_ShimSrcAttribute -#else -#define MAYBE_ShimSrcAttribute ShimSrcAttribute -#endif -IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_ShimSrcAttribute) { +// http://crbug.com/176122: This test is flaky. +IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_ShimSrcAttribute) { ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/src_attribute")) << message_; } diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 4f223e5..9a9a718 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -2725,7 +2725,8 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting3) { // Tests that we can handle when a network request was canceled while we were // waiting for the network delegate. // Part 4: Request is cancelled while waiting for OnAuthRequired callback. -TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting4) { +// Disabled: crbug.com/158130. +TEST_F(URLRequestTestHTTP, DISABLED_NetworkDelegateCancelWhileWaiting4) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; |