Commit 480bf75a authored by jam@chromium.org's avatar jam@chromium.org

Disable MigrationSingleClientTest.AllTypesIndividually* since they're timing...

Disable MigrationSingleClientTest.AllTypesIndividually* since they're timing out sometimes on Windows

BUG=403778
TBR=akalin@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/471993002

Cr-Commit-Position: refs/heads/master@{#289598}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289598 0039d316-1c4b-4281-b951-d872f2087c98
parent 797902a2
......@@ -375,13 +375,25 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
}
// The whole shebang -- all data types.
IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesIndividually) {
#if defined(OS_WIN)
// http://crbug.com/403778
#define MAYBE_AllTypesIndividually DISABLED_AllTypesIndividually
#else
#define MAYBE_AllTypesIndividually AllTypesIndividually
#endif
IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) {
ASSERT_TRUE(SetupClients());
RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
}
#if defined(OS_WIN)
// http://crbug.com/403778
#define MAYBE_AllTypesIndividuallyTriggerNotification DISABLED_AllTypesIndividuallyTriggerNotification
#else
#define MAYBE_AllTypesIndividuallyTriggerNotification AllTypesIndividuallyTriggerNotification
#endif
IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
AllTypesIndividuallyTriggerNotification) {
MAYBE_AllTypesIndividuallyTriggerNotification) {
ASSERT_TRUE(SetupClients());
RunSingleClientMigrationTest(GetPreferredDataTypesList(),
TRIGGER_NOTIFICATION);
......
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