Skip to content

GitLab

T
tangled
Commit 77a493ce authored by maruel's avatar maruel Committed by Commit bot
Browse files
Options

Disable to sync_integration_tests that fail consistently on OSX. 

MigrationSingleClientTest.AllTypesIndividually
MigrationSingleClientTest.AllTypesIndividuallyTriggerNotification

TBR=jam@chromium.org
BUG=403778

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

Cr-Commit-Position: refs/heads/master@{#297517}
parent f46f24fc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
chrome/browser/sync/test/integration/migration_test.cc
View file @ 77a493ce
...@@ -283,7 +283,7 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) { ...@@ -283,7 +283,7 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
} }
// The whole shebang -- all data types. // The whole shebang -- all data types.
#if defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX)
// http://crbug.com/403778 // http://crbug.com/403778
#define MAYBE_AllTypesIndividually DISABLED_AllTypesIndividually #define MAYBE_AllTypesIndividually DISABLED_AllTypesIndividually
#else #else
...@@ -294,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) { ...@@ -294,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) {
RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK); RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
} }
#if defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX)
// http://crbug.com/403778 // http://crbug.com/403778
#define MAYBE_AllTypesIndividuallyTriggerNotification DISABLED_AllTypesIndividuallyTriggerNotification #define MAYBE_AllTypesIndividuallyTriggerNotification DISABLED_AllTypesIndividuallyTriggerNotification
#else #else
......
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