Commit d884b574 authored by grt@chromium.org's avatar grt@chromium.org

Marking MigrationTwoClientTest.MigrationHellWithoutNigori flaky on Mac 10.6.

BUG=107205
TEST=none

Review URL: http://codereview.chromium.org/8917010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114023 0039d316-1c4b-4281-b951-d872f2087c98
parent 80b07611
......@@ -351,9 +351,17 @@ IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
MODIFY_BOOKMARK);
}
// Flaky on Mac 10.6 Sync bot: http://crbug.com/107205.
#if defined(OS_MACOSX)
#define MAYBE_MigrationHellWithoutNigori FLAKY_MigrationHellWithoutNigori
#else
#define MAYBE_MigrationHellWithoutNigori MigrationHellWithoutNigori
#endif
// 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) {
IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
MAYBE_MigrationHellWithoutNigori) {
ASSERT_TRUE(SetupClients());
MigrationList migration_list = GetPreferredDataTypesList();
// Let the first nudge be a datatype that's neither prefs nor
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment