diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 14:22:29 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 14:22:29 +0000 |
| commit | 59c04dfb83765c03e8d97fe9052cde4235a198e5 (patch) | |
| tree | 05bebe8ff8b1012ad367bd371f7ad87ece2957b1 | |
| parent | dc5c4855e45ff280cd8f52a1c9f4643348b5153b (diff) | |
| download | chromium_src-59c04dfb83765c03e8d97fe9052cde4235a198e5.zip chromium_src-59c04dfb83765c03e8d97fe9052cde4235a198e5.tar.gz chromium_src-59c04dfb83765c03e8d97fe9052cde4235a198e5.tar.bz2 | |
[Mac] Spin event loop longer for tearing down test windows.
BookmarkBubbleControllerTest needs _three_ passes. I believe it's
because the bubble is a child window.
BUG=none
TEST=allows test to run on tsan bots.
Review URL: http://codereview.chromium.org/661347
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40378 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/cocoa_test_helper.mm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm index 10fcd95..530d2034 100644 --- a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm @@ -26,6 +26,8 @@ class BookmarkBubbleControllerTest : public CocoaTest { } virtual void TearDown() { + // TODO(shess): Figure out why CocoaTest::TearDown() needs 3 + // passes through the event loop to fully close out these windows. [controller_ close]; controller_ = nil; CocoaTest::TearDown(); diff --git a/chrome/browser/cocoa/cocoa_test_helper.mm b/chrome/browser/cocoa/cocoa_test_helper.mm index 92bee83..5f9bf45 100644 --- a/chrome/browser/cocoa/cocoa_test_helper.mm +++ b/chrome/browser/cocoa/cocoa_test_helper.mm @@ -104,7 +104,7 @@ void CocoaTest::TearDown() { // Cover chains of delayed actions by spinning the loop at least // this many times. - const int kCloseSpins = 2; + const int kCloseSpins = 3; // Track the set of remaining windows so that everything can be // reset if progress is made. |