Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/test/integration/sync_errors_test.cc

Issue 2738243002: [Sync] Enable Sync_integration_tests on chromeos (Closed)
Patch Set: add to main waterfall Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/sync_errors_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
index 9e28f92ebcf9a4d62850044545d9bf4bbea1ba53..7b2227a3c8d945cdd6df95b0c4ef588a3248321e 100644
--- a/chrome/browser/sync/test/integration/sync_errors_test.cc
+++ b/chrome/browser/sync/test/integration/sync_errors_test.cc
@@ -147,7 +147,13 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, ActionableErrorTest) {
// This test verifies that sync keeps retrying if it encounters error during
// setup.
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, ErrorWhileSettingUp) {
+// crbug.com/689662
+#if defined(OS_CHROMEOS)
+#define MAYBE_ErrorWhileSettingUp DISABLED_ErrorWhileSettingUp
+#else
+#define MAYBE_ErrorWhileSettingUp ErrorWhileSettingUp
+#endif
+IN_PROC_BROWSER_TEST_F(SyncErrorTest, MAYBE_ErrorWhileSettingUp) {
ASSERT_TRUE(SetupClients());
#if !defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698