summaryrefslogtreecommitdiffstats
path: root/chrome/common/service_process_util_unittest.cc
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 19:29:27 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 19:29:27 +0000
commit5bde6d1668fe077024c99cecfce09cb6bd4a67ee (patch)
tree6b2f67a32bc104888f11bf30393b3232efd29494 /chrome/common/service_process_util_unittest.cc
parent9091fb63ab0a815870f6731dd6113e17c59c093e (diff)
downloadchromium_src-5bde6d1668fe077024c99cecfce09cb6bd4a67ee.zip
chromium_src-5bde6d1668fe077024c99cecfce09cb6bd4a67ee.tar.gz
chromium_src-5bde6d1668fe077024c99cecfce09cb6bd4a67ee.tar.bz2
Fixes up the race condition that exists with deleting a file vs watching it.
The tests created a file and attempted to hook a watcher on it on a separate thread but it was deleting it before the thread had a chance to watch it. BUG=77217,77064, 69641 TEST=BUILD Review URL: http://codereview.chromium.org/6676118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/service_process_util_unittest.cc')
-rw-r--r--chrome/common/service_process_util_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index 840c1a5..e542f09 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -493,8 +493,7 @@ TEST_F(ServiceProcessStateFileManipulationTest, DeleteFile) {
ASSERT_TRUE(mock_launchd()->delete_called());
}
-// Flaky on mac. http://crbug.com/77217
-TEST_F(ServiceProcessStateFileManipulationTest, FLAKY_DeleteBundle) {
+TEST_F(ServiceProcessStateFileManipulationTest, DeleteBundle) {
GetIOMessageLoopProxy()->PostTask(
FROM_HERE,
NewRunnableFunction(&DeleteFunc, bundle_path()));