summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 23:31:19 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 23:31:19 +0000
commit8f21b48d42cc191a643280d280430876dafaaf0e (patch)
tree549c3f4d310c078ea36cfeb1ff75ff40778fbae2
parentf513c61765d213d0730fa485263acf442b71b03e (diff)
downloadchromium_src-8f21b48d42cc191a643280d280430876dafaaf0e.zip
chromium_src-8f21b48d42cc191a643280d280430876dafaaf0e.tar.gz
chromium_src-8f21b48d42cc191a643280d280430876dafaaf0e.tar.bz2
[Sync] Disable purge/configuration tests on windows
Failing on buildbots, but not locally/trybots. BUG=139726 TBR=sergeyu@chromium.org Review URL: https://chromiumcodereview.appspot.com/10836021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149074 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--sync/internal_api/syncapi_unittest.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc
index 7ac20d0..3c0a1d5 100644
--- a/sync/internal_api/syncapi_unittest.cc
+++ b/sync/internal_api/syncapi_unittest.cc
@@ -2559,6 +2559,12 @@ class SyncManagerTestWithMockScheduler : public SyncManagerTest {
// Test that the configuration params are properly created and sent to
// ScheduleConfigure. No callback should be invoked. Any disabled datatypes
// should be purged.
+// Fails on Windows: crbug.com/139726
+#if defined(OS_WIN)
+#define MAYBE_BasicConfiguration DISABLED_BasicConfiguration
+#else
+#define MAYBE_BasicConfiguration BasicConfiguration
+#endif
TEST_F(SyncManagerTestWithMockScheduler, BasicConfiguration) {
ConfigureReason reason = CONFIGURE_REASON_RECONFIGURATION;
ModelTypeSet types_to_download(BOOKMARKS, PREFERENCES);
@@ -2734,6 +2740,12 @@ TEST_F(SyncManagerTest, PurgePartiallySyncedTypes) {
// Test CleanipDisabledTypes properly purges all disabled types as specified
// by the previous and current enabled params. Enabled partial types should not
// be purged.
+// Fails on Windows: crbug.com/139726
+#if defined(OS_WIN)
+#define MAYBE_PurgeDisabledTypes DISABLED_PurgeDisabledTypes
+#else
+#define MAYBE_PurgeDisabledTypes PurgeDisabledTypes
+#endif
TEST_F(SyncManagerTest, PurgeDisabledTypes) {
ModelSafeRoutingInfo routing_info;
GetModelSafeRoutingInfo(&routing_info);