diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:18:26 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:18:26 +0000 |
| commit | 86c65310708e4de9c4b552302d665427a6a53d3f (patch) | |
| tree | 4de497a91beee0ba79215479c0801bb908ca57d0 /chrome/browser/sync | |
| parent | 1be9981283fdf0184427ca91b3e7417b4cd3ca22 (diff) | |
| download | chromium_src-86c65310708e4de9c4b552302d665427a6a53d3f.zip chromium_src-86c65310708e4de9c4b552302d665427a6a53d3f.tar.gz chromium_src-86c65310708e4de9c4b552302d665427a6a53d3f.tar.bz2 | |
[sync] Temporarily disable MigrationTwoClientTest.MigrationHellWithoutNigori
The sync_integration_test MigrationTwoClientTestMigrationHellWithoutNigori takes longer than a minute to run on the chrome buildbots. The effect this had earlier was that test runs would take a little longer to run. Now that sharding is enabled on some of the sync buildbots / trybots, tests that run for longer than 45 seconds will cause redness on the tree.
This patch temporarily disables the test until http://codereview.chromium.org/11183073 is landed, at which point the tests should speed up significantly.
TBR=timsteele@chromium.org
BUG=none
TEST=MigrationTwoClientTest.MigrationHellWithoutNigori
Review URL: https://codereview.chromium.org/11175048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/test/integration/migration_errors_test.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/sync/test/integration/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc index 11ff994..163a058 100644 --- a/chrome/browser/sync/test/integration/migration_errors_test.cc +++ b/chrome/browser/sync/test/integration/migration_errors_test.cc @@ -361,7 +361,12 @@ IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, // Migrate every datatype in sequence; the catch being that the server // will only tell the client about the migrations one at a time. -IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, MigrationHellWithoutNigori) { +// TODO(rsimha): This test takes longer than 60 seconds, and will cause tree +// redness due to sharding. +// Re-enable this test after syncer::kInitialBackoffShortRetrySeconds is reduced +// to zero. +IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, + DISABLED_MigrationHellWithoutNigori) { ASSERT_TRUE(SetupClients()); MigrationList migration_list = GetPreferredDataTypesList(); // Let the first nudge be a datatype that's neither prefs nor |