diff options
| author | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 10:13:22 +0000 |
|---|---|---|
| committer | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 10:13:22 +0000 |
| commit | 7aa44d9cab3c355b349b5ed18f109c3b74112879 (patch) | |
| tree | caf6fd3914f2b30607b3cbacbe7812e87112e0ce /chrome | |
| parent | 496c5a1e1486595e7c5d2ee9281b7b9bd7024164 (diff) | |
| download | chromium_src-7aa44d9cab3c355b349b5ed18f109c3b74112879.zip chromium_src-7aa44d9cab3c355b349b5ed18f109c3b74112879.tar.gz chromium_src-7aa44d9cab3c355b349b5ed18f109c3b74112879.tar.bz2 | |
Fix race in ProfileBrowserTest.ProfileReadmeCreated.
The problem was with the test waiting for an incorrect message loop to finish.
BUG=119059
TEST=ProfileBrowserTest.*
Review URL: http://codereview.chromium.org/9759001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/profiles/profile_browsertest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc index 3c09095..eb5cf21 100644 --- a/chrome/browser/profiles/profile_browsertest.cc +++ b/chrome/browser/profiles/profile_browsertest.cc @@ -128,8 +128,7 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateOldProfileAsynchronous) { } // Test that a README file is created for profiles that didn't have it. -// Fails on some bots, see http://crbug.com/119059. -IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, FAILS_ProfileReadmeCreated) { +IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, ProfileReadmeCreated) { ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); @@ -149,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, FAILS_ProfileReadmeCreated) { content::Source<Profile>(profile.get())); observer.Wait(); - ui_test_utils::RunAllPendingInMessageLoop(); + ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE); // Verify that README exists. EXPECT_TRUE(file_util::PathExists( @@ -175,4 +174,5 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, ProfileDeletedBeforeReadmeCreated) { // for README creation). profile.reset(); ui_test_utils::RunAllPendingInMessageLoop(); + ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE); } |