summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 22:39:18 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 22:39:18 +0000
commit3e501ec261c46fe7fe72120ac17f754391cff15d (patch)
tree6ddaf29e8fb0c3c4be76af8e055287802f40dc3b /chrome/browser/cocoa
parent45dc74d1275e9732cb3204785a2c17a02e5692cd (diff)
downloadchromium_src-3e501ec261c46fe7fe72120ac17f754391cff15d.zip
chromium_src-3e501ec261c46fe7fe72120ac17f754391cff15d.tar.gz
chromium_src-3e501ec261c46fe7fe72120ac17f754391cff15d.tar.bz2
BookmarkAllTabsControllerTest.BookmarkAllTabs fails under valgrind;
the test claims windows are left around. Things are fine when run normally. For this case, sheets don't always close in time if run under valgrind. Increase timeout to be a kinder, gentler unit test. Remove suppression. BUG=http://crbug.com/39282 Review URL: http://codereview.chromium.org/2814011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/cocoa_test_helper.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/cocoa_test_helper.mm b/chrome/browser/cocoa/cocoa_test_helper.mm
index 5f9bf45..ae3c7cc 100644
--- a/chrome/browser/cocoa/cocoa_test_helper.mm
+++ b/chrome/browser/cocoa/cocoa_test_helper.mm
@@ -99,8 +99,9 @@ void CocoaTest::TearDown() {
while (windows_left.size() > 0) {
// Cover delayed actions by spinning the loop at least once after
- // this timeout.
- const NSTimeInterval kCloseTimeout = 1.0;
+ // this timeout. Made large to accomocate valgrind and the wall
+ // clock delay of a [NSApplication endSheet:].
+ const NSTimeInterval kCloseTimeout = 5.0;
// Cover chains of delayed actions by spinning the loop at least
// this many times.