summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 20:58:57 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 20:58:57 +0000
commit7b55ab231f2d9f3e04a8fa668f7e41e45ecc1810 (patch)
treeab20ab27cdfa8cd1d461a74a1a41cb74bfc40b40 /content
parent13eb229606d6ec40aa0ef0fbf2265cba9ca5683c (diff)
downloadchromium_src-7b55ab231f2d9f3e04a8fa668f7e41e45ecc1810.zip
chromium_src-7b55ab231f2d9f3e04a8fa668f7e41e45ecc1810.tar.gz
chromium_src-7b55ab231f2d9f3e04a8fa668f7e41e45ecc1810.tar.bz2
Marking ResourceDispatcherTest.CrossSiteNoUnloadOn204 flaky on Windows.
BUG=80596 TEST=ui_tests TBR=robertshield@chromium.org Review URL: http://codereview.chromium.org/7452001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/resource_dispatcher_host_uitest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
index 6810c18..59ae9ee 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -227,8 +227,15 @@ TEST_F(ResourceDispatcherTest, CrossSiteImmediateLoadOnunloadCookie) {
ASSERT_STREQ("foo", value_result.c_str());
}
+#if defined(OS_WIN)
+// Seems to fail sometimes on Windows: http://crbug.com/80596
+#define MAYBE_CrossSiteNoUnloadOn204 FLAKY_CrossSiteNoUnloadOn204
+#else
+#define MAYBE_CrossSiteNoUnloadOn204 CrossSiteNoUnloadOn204
+#endif
+
// Tests that the unload handler is not run for 204 responses.
-TEST_F(ResourceDispatcherTest, CrossSiteNoUnloadOn204) {
+TEST_F(ResourceDispatcherTest, MAYBE_CrossSiteNoUnloadOn204) {
net::TestServer test_server(net::TestServer::TYPE_HTTP,
FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(test_server.Start());