summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 12:54:04 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 12:54:04 +0000
commit4ab7d0f92de46d60b547348b9308682c9a4b0974 (patch)
tree145492f361311e9bc46fda1707d661818cef801d /chrome
parent0fe211bedec143d5a4222a8eee259a7f97d64dc3 (diff)
downloadchromium_src-4ab7d0f92de46d60b547348b9308682c9a4b0974.zip
chromium_src-4ab7d0f92de46d60b547348b9308682c9a4b0974.tar.gz
chromium_src-4ab7d0f92de46d60b547348b9308682c9a4b0974.tar.bz2
Disable test SidebarTest.SidebarNavigate as it times out on windows.
BUG=57964 TEST=none TBR=brettw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/sidebar/sidebar_test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/sidebar/sidebar_test.cc b/chrome/browser/sidebar/sidebar_test.cc
index a518587..0c397c5 100644
--- a/chrome/browser/sidebar/sidebar_test.cc
+++ b/chrome/browser/sidebar/sidebar_test.cc
@@ -165,7 +165,13 @@ IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarOnInactiveTab) {
HideSidebarForCurrentTab();
}
-IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarNavigate) {
+// FAILS, http://crbug.com/57964
+#if defined(OS_WIN)
+#define MAYBE_SidebarNavigate DISABLED_SidebarNavigate
+#else
+#define MAYBE_SidebarNavigate SidebarNavigate
+#endif
+IN_PROC_BROWSER_TEST_F(SidebarTest, MAYBE_SidebarNavigate) {
ShowSidebarForCurrentTab();
NavigateSidebarForCurrentTabTo(kSimplePage);