summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 00:28:27 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 00:28:27 +0000
commitc03aa00ce4aa44a48927a087663c8f6dbcd1f06c (patch)
tree5ca619dc68024454f8ba3fcec230c20d2d34fba5 /chrome/browser/cocoa
parent3b6a5712d3a2b6e5698403ce90c676ddd98199a5 (diff)
downloadchromium_src-c03aa00ce4aa44a48927a087663c8f6dbcd1f06c.zip
chromium_src-c03aa00ce4aa44a48927a087663c8f6dbcd1f06c.tar.gz
chromium_src-c03aa00ce4aa44a48927a087663c8f6dbcd1f06c.tar.bz2
Disable two tests that fail on the Mac tsan bots.
BUG=36736 TEST=None Review URL: http://codereview.chromium.org/660045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/browser_window_controller_unittest.mm8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller_unittest.mm b/chrome/browser/cocoa/browser_window_controller_unittest.mm
index 47b8bea..911153c 100644
--- a/chrome/browser/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/browser_window_controller_unittest.mm
@@ -585,7 +585,9 @@ class BrowserWindowFullScreenControllerTest : public CocoaTest {
- (BOOL)supportsFullscreen;
@end
-TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) {
+// Disabled because it fails (and later crashes) the tsan bot.
+// http://crbug.com/36736
+TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestFullscreen) {
EXPECT_FALSE([controller_ isFullscreen]);
[controller_ setFullscreen:YES];
EXPECT_TRUE([controller_ isFullscreen]);
@@ -593,7 +595,9 @@ TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) {
EXPECT_FALSE([controller_ isFullscreen]);
}
-TEST_F(BrowserWindowFullScreenControllerTest, TestActivate) {
+// Disabled because it fails (and later crashes) the tsan bot.
+// http://crbug.com/36736
+TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestActivate) {
EXPECT_FALSE([controller_ isFullscreen]);
[controller_ activate];