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

Unified Diff: sync/internal_api/syncapi_unittest.cc

Issue 10837012: [Sync] Fix disabling of tests from 149074 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/syncapi_unittest.cc
diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc
index 3c0a1d538f9f3ea27f5e52864370d71d18c11425..e43a2e2ab7760549a5557478e5d1552032b9e86a 100644
--- a/sync/internal_api/syncapi_unittest.cc
+++ b/sync/internal_api/syncapi_unittest.cc
@@ -2565,7 +2565,7 @@ class SyncManagerTestWithMockScheduler : public SyncManagerTest {
#else
#define MAYBE_BasicConfiguration BasicConfiguration
#endif
-TEST_F(SyncManagerTestWithMockScheduler, BasicConfiguration) {
+TEST_F(SyncManagerTestWithMockScheduler, MAYBE_BasicConfiguration) {
ConfigureReason reason = CONFIGURE_REASON_RECONFIGURATION;
ModelTypeSet types_to_download(BOOKMARKS, PREFERENCES);
ModelSafeRoutingInfo new_routing_info;
@@ -2746,7 +2746,7 @@ TEST_F(SyncManagerTest, PurgePartiallySyncedTypes) {
#else
#define MAYBE_PurgeDisabledTypes PurgeDisabledTypes
#endif
-TEST_F(SyncManagerTest, PurgeDisabledTypes) {
+TEST_F(SyncManagerTest, MAYBE_PurgeDisabledTypes) {
ModelSafeRoutingInfo routing_info;
GetModelSafeRoutingInfo(&routing_info);
ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698