summaryrefslogtreecommitdiffstats
path: root/chrome/browser/repost_form_warning_uitest.cc
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 21:32:29 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 21:32:29 +0000
commitea57bd2bf747ade6f419bbb32903a72902221e18 (patch)
tree230bb159638284cf36432a78489a5672d0d4f145 /chrome/browser/repost_form_warning_uitest.cc
parent702cbaafc25ea1c4ff015e57416943cd15232849 (diff)
downloadchromium_src-ea57bd2bf747ade6f419bbb32903a72902221e18.zip
chromium_src-ea57bd2bf747ade6f419bbb32903a72902221e18.tar.gz
chromium_src-ea57bd2bf747ade6f419bbb32903a72902221e18.tar.bz2
Marking RepostFormWarningTest.TestDoubleReload and RepostFormWarningTest.TestLoginAfterRepost as flaky on Windows.
BUG=47228 TEST=none TBR=avi,willchan Review URL: http://codereview.chromium.org/2848019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/repost_form_warning_uitest.cc')
-rw-r--r--chrome/browser/repost_form_warning_uitest.cc18
1 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/repost_form_warning_uitest.cc b/chrome/browser/repost_form_warning_uitest.cc
index 4f61292..46e43cb 100644
--- a/chrome/browser/repost_form_warning_uitest.cc
+++ b/chrome/browser/repost_form_warning_uitest.cc
@@ -21,7 +21,14 @@ const wchar_t kDocRoot[] = L"chrome/test/data";
typedef UITest RepostFormWarningTest;
-TEST_F(RepostFormWarningTest, TestDoubleReload) {
+#if defined(OS_WIN)
+// http://crbug.com/47228
+#define MAYBE_TestDoubleReload FLAKY_TestDoubleReload
+#else
+#define MAYBE_TestDoubleReload TestDoubleReload
+#endif
+
+TEST_F(RepostFormWarningTest, MAYBE_TestDoubleReload) {
scoped_refptr<HTTPTestServer> server =
HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
@@ -45,7 +52,14 @@ TEST_F(RepostFormWarningTest, TestDoubleReload) {
ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("bar")));
}
-TEST_F(RepostFormWarningTest, TestLoginAfterRepost) {
+#if defined(OS_WIN)
+// http://crbug.com/47228
+#define MAYBE_TestLoginAfterRepost FLAKY_TestLoginAfterRepost
+#else
+#define MAYBE_TestLoginAfterRepost TestLoginAfterRepost
+#endif
+
+TEST_F(RepostFormWarningTest, MAYBE_TestLoginAfterRepost) {
scoped_refptr<HTTPTestServer> server =
HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());