diff options
| author | braffert@chromium.org <braffert@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 08:31:00 +0000 |
|---|---|---|
| committer | braffert@chromium.org <braffert@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 08:31:00 +0000 |
| commit | 8d6ed15f3f74d3c8c9ce29d220cb65af7670eb00 (patch) | |
| tree | ca27b5892838a7df4b8ff51bd0c7852fde60e4a3 /chrome | |
| parent | 4b635a84851c2102235e667db7bcfff3414ac8d6 (diff) | |
| download | chromium_src-8d6ed15f3f74d3c8c9ce29d220cb65af7670eb00.zip chromium_src-8d6ed15f3f74d3c8c9ce29d220cb65af7670eb00.tar.gz chromium_src-8d6ed15f3f74d3c8c9ce29d220cb65af7670eb00.tar.bz2 | |
Fixing race condition in TwoClientLivePreferencesSyncTest.kAcceptLanguages sync integration test.
BUG=85250
TEST=TwoClientLivePreferencesSyncTest.kAcceptLanguages
Review URL: http://codereview.chromium.org/7099003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/live_sync/two_client_live_preferences_sync_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc index 306bd91..86be274 100644 --- a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc +++ b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc @@ -434,15 +434,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, } // TCM ID - 7583816 -// TODO(braffert): This test fails on linux. See http://crbug.com/85250. -IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, - FAILS_kAcceptLanguages) { +IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, kAcceptLanguages) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; + DisableVerifier(); ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages)); AppendStringPref(0, prefs::kAcceptLanguages, ",ar"); AppendStringPref(1, prefs::kAcceptLanguages, ",fr"); - ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); + ASSERT_TRUE(AwaitQuiescence()); // kAcceptLanguages is not synced on Mac. #if !defined(OS_MACOSX) ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages)); |