summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 01:00:22 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 01:00:22 +0000
commitf70cae4cee5dfad1aa538c7e63e0761008b3fef6 (patch)
tree4dd8102319f7bb61771339878146b6315ca871c1
parent1408c8297755306f0d688956fbc2f93fd6d692ac (diff)
downloadchromium_src-f70cae4cee5dfad1aa538c7e63e0761008b3fef6.zip
chromium_src-f70cae4cee5dfad1aa538c7e63e0761008b3fef6.tar.gz
chromium_src-f70cae4cee5dfad1aa538c7e63e0761008b3fef6.tar.bz2
Disable TabSwitchingUITest TabSwitch on windows, started failing after a webkit roll.
BUG=46751 TEST=none TBR=bulach Review URL: http://codereview.chromium.org/2811012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50060 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/tab_switching/tab_switching_test.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc
index 4f74c6e..e906002 100644
--- a/chrome/test/tab_switching/tab_switching_test.cc
+++ b/chrome/test/tab_switching/tab_switching_test.cc
@@ -180,7 +180,14 @@ class TabSwitchingUITest : public UITest {
DISALLOW_COPY_AND_ASSIGN(TabSwitchingUITest);
};
-TEST_F(TabSwitchingUITest, TabSwitch) {
+#if defined(OS_WIN)
+// Started failing with a webkit roll in r49936. See http://crbug.com/46751
+#define MAYBE_TabSwitch DISABLED_TabSwitch
+#else
+#define MAYBE_TabSwitch TabSwitch
+#endif
+
+TEST_F(TabSwitchingUITest, MAYBE_TabSwitch) {
RunTabSwitchingUITest("t", true);
}