diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 06:10:35 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 06:10:35 +0000 |
| commit | 5c4d804bc831a13f596245419337b83aa8a500d7 (patch) | |
| tree | 17856810343782d9b41220e44a8e79cdc35b7f33 | |
| parent | ada9baa8097bb75c87b73d02d297af51f9b6cd9c (diff) | |
| download | chromium_src-5c4d804bc831a13f596245419337b83aa8a500d7.zip chromium_src-5c4d804bc831a13f596245419337b83aa8a500d7.tar.gz chromium_src-5c4d804bc831a13f596245419337b83aa8a500d7.tar.bz2 | |
Re-enable stress sync integration tests
The stress sync integration tests use 10 sync clients, and were
originally flaky due to testserver bugginess.
Several fixes have gone in since then, and it might be time to re-enable
those tests.
Note to future Chromium Sheriffs: If these stress tests do fail or time out in future, feel free to revert this patch.
BUG=69604
TEST=sync_integration_tests --gtest_filter=ManyClient*
Review URL: http://codereview.chromium.org/8568033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110450 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc index 27c6fb3..fc65a52 100644 --- a/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc @@ -19,8 +19,7 @@ class ManyClientBookmarksSyncTest : public SyncTest { DISALLOW_COPY_AND_ASSIGN(ManyClientBookmarksSyncTest); }; -// TODO(rsimha): Enable once http://crbug.com/69604 is fixed. -IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, DISABLED_Sanity) { +IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, Sanity) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(AddURL(0, L"Google URL", GURL("http://www.google.com/")) != NULL); ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients())); diff --git a/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc index e5519bc..d9cabfd 100644 --- a/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc @@ -27,8 +27,7 @@ class ManyClientPasswordsSyncTest : public SyncTest { DISALLOW_COPY_AND_ASSIGN(ManyClientPasswordsSyncTest); }; -// TODO(rsimha): Enable once http://crbug.com/69604 is fixed. -IN_PROC_BROWSER_TEST_F(ManyClientPasswordsSyncTest, DISABLED_Sanity) { +IN_PROC_BROWSER_TEST_F(ManyClientPasswordsSyncTest, Sanity) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; PasswordForm form = CreateTestPasswordForm(0); diff --git a/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc index 5301763..ed30bcb 100644 --- a/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc @@ -19,8 +19,7 @@ class ManyClientPreferencesSyncTest : public SyncTest { DISALLOW_COPY_AND_ASSIGN(ManyClientPreferencesSyncTest); }; -// TODO(rsimha): Enable once http://crbug.com/69604 is fixed. -IN_PROC_BROWSER_TEST_F(ManyClientPreferencesSyncTest, DISABLED_Sanity) { +IN_PROC_BROWSER_TEST_F(ManyClientPreferencesSyncTest, Sanity) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); |