Disable ProfileSyncServicePasswordTest and TokenServiceTableTest on Mac.

chrome/browser/sync/profile_sync_service_password_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 315 matching lines @@
   scoped_refptr<MockPasswordStore> password_store_;
   content::NotificationRegistrar registrar_;
 };
 
 void AddPasswordEntriesCallback(ProfileSyncServicePasswordTest* test,
                                 const std::vector<PasswordForm>& entries) {
   for (size_t i = 0; i < entries.size(); ++i)
     test->AddPasswordSyncNode(entries[i]);
 }
 
-TEST_F(ProfileSyncServicePasswordTest, FailModelAssociation) {
+// Flaky on mac_rel. See http://crbug.com/228943
+#if defined(OS_MACOSX)
+#define MAYBE_EmptyNativeEmptySync DISABLED_EmptyNativeEmptySync
+#define MAYBE_EnsureNoTransactions DISABLED_EnsureNoTransactions
+#define MAYBE_FailModelAssociation DISABLED_FailModelAssociation
+#define MAYBE_FailPasswordStoreLoad DISABLED_FailPasswordStoreLoad
+#define MAYBE_HasNativeEntriesEmptySync DISABLED_HasNativeEntriesEmptySync
+#define MAYBE_HasNativeEntriesEmptySyncSameUsername \
+    DISABLED_HasNativeEntriesEmptySyncSameUsername
+#define MAYBE_HasNativeHasSyncMergeEntry DISABLED_HasNativeHasSyncMergeEntry
+#define MAYBE_HasNativeHasSyncNoMerge DISABLED_HasNativeHasSyncNoMerge
+#else
+#define MAYBE_EmptyNativeEmptySync EmptyNativeEmptySync
+#define MAYBE_EnsureNoTransactions EnsureNoTransactions
+#define MAYBE_FailModelAssociation FailModelAssociation
+#define MAYBE_FailPasswordStoreLoad FailPasswordStoreLoad
+#define MAYBE_HasNativeEntriesEmptySync HasNativeEntriesEmptySync
+#define MAYBE_HasNativeEntriesEmptySyncSameUsername \
+    HasNativeEntriesEmptySyncSameUsername
+#define MAYBE_HasNativeHasSyncMergeEntry HasNativeHasSyncMergeEntry
+#define MAYBE_HasNativeHasSyncNoMerge HasNativeHasSyncNoMerge
+#endif
+
+TEST_F(ProfileSyncServicePasswordTest, MAYBE_FailModelAssociation) {
   StartSyncService(base::Closure(), base::Closure());
   EXPECT_TRUE(sync_service_->HasUnrecoverableError());
 }
 
-TEST_F(ProfileSyncServicePasswordTest, FailPasswordStoreLoad) {
+TEST_F(ProfileSyncServicePasswordTest, MAYBE_FailPasswordStoreLoad) {
   password_store_ = static_cast<NullPasswordStore*>(
       PasswordStoreFactory::GetInstance()->SetTestingFactoryAndUse(
           &profile_, NullPasswordStore::Build).get());
   StartSyncService(base::Closure(), base::Closure());
   EXPECT_FALSE(sync_service_->HasUnrecoverableError());
   syncer::ModelTypeSet failed_types =
       sync_service_->failed_datatypes_handler().GetFailedTypes();
   EXPECT_TRUE(failed_types.Equals(syncer::ModelTypeSet(syncer::PASSWORDS)));
 }
 
-TEST_F(ProfileSyncServicePasswordTest, EmptyNativeEmptySync) {
+TEST_F(ProfileSyncServicePasswordTest, MAYBE_EmptyNativeEmptySync) {
   EXPECT_CALL(*password_store_, FillAutofillableLogins(_))
       .WillOnce(Return(true));
   EXPECT_CALL(*password_store_, FillBlacklistLogins(_))
       .WillOnce(Return(true));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::PASSWORDS);
   StartSyncService(create_root.callback(), base::Closure());
   std::vector<PasswordForm> sync_entries;
   GetPasswordEntriesFromSyncDB(&sync_entries);
   EXPECT_EQ(0U, sync_entries.size());
 }
 
-TEST_F(ProfileSyncServicePasswordTest, HasNativeEntriesEmptySync) {
+TEST_F(ProfileSyncServicePasswordTest, MAYBE_HasNativeEntriesEmptySync) {
   std::vector<PasswordForm*> forms;
   std::vector<PasswordForm> expected_forms;
   PasswordForm* new_form = new PasswordForm;
   new_form->scheme = PasswordForm::SCHEME_HTML;
   new_form->signon_realm = "pie";
   new_form->origin = GURL("http://pie.com");
   new_form->action = GURL("http://pie.com/submit");
   new_form->username_element = UTF8ToUTF16("name");
   new_form->username_value = UTF8ToUTF16("tom");
   new_form->password_element = UTF8ToUTF16("cork");
@@ skipping 10 matching lines @@
       .WillOnce(Return(true));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::PASSWORDS);
   StartSyncService(create_root.callback(), base::Closure());
   std::vector<PasswordForm> sync_forms;
   GetPasswordEntriesFromSyncDB(&sync_forms);
   ASSERT_EQ(1U, sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], sync_forms[0]));
 }
 
-TEST_F(ProfileSyncServicePasswordTest, HasNativeEntriesEmptySyncSameUsername) {
+TEST_F(ProfileSyncServicePasswordTest,
+       MAYBE_HasNativeEntriesEmptySyncSameUsername) {
   std::vector<PasswordForm*> forms;
   std::vector<PasswordForm> expected_forms;
 
   {
     PasswordForm* new_form = new PasswordForm;
     new_form->scheme = PasswordForm::SCHEME_HTML;
     new_form->signon_realm = "pie";
     new_form->origin = GURL("http://pie.com");
     new_form->action = GURL("http://pie.com/submit");
     new_form->username_element = UTF8ToUTF16("name");
@@ skipping 32 matching lines @@
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::PASSWORDS);
   StartSyncService(create_root.callback(), base::Closure());
   std::vector<PasswordForm> sync_forms;
   GetPasswordEntriesFromSyncDB(&sync_forms);
   ASSERT_EQ(2U, sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], sync_forms[1]));
   EXPECT_TRUE(ComparePasswords(expected_forms[1], sync_forms[0]));
 }
 
-TEST_F(ProfileSyncServicePasswordTest, HasNativeHasSyncNoMerge) {
+TEST_F(ProfileSyncServicePasswordTest, MAYBE_HasNativeHasSyncNoMerge) {
   std::vector<PasswordForm*> native_forms;
   std::vector<PasswordForm> sync_forms;
   std::vector<PasswordForm> expected_forms;
   {
     PasswordForm* new_form = new PasswordForm;
     new_form->scheme = PasswordForm::SCHEME_HTML;
     new_form->signon_realm = "pie";
     new_form->origin = GURL("http://pie.com");
     new_form->action = GURL("http://pie.com/submit");
     new_form->username_element = UTF8ToUTF16("name");
@@ skipping 39 matching lines @@
   std::vector<PasswordForm> new_sync_forms;
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(2U, new_sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
   EXPECT_TRUE(ComparePasswords(expected_forms[1], new_sync_forms[1]));
 }
 
 // Same as HasNativeHasEmptyNoMerge, but we attempt to aquire a sync transaction
 // every time the password store is accessed.
-TEST_F(ProfileSyncServicePasswordTest, EnsureNoTransactions) {
+TEST_F(ProfileSyncServicePasswordTest, MAYBE_EnsureNoTransactions) {
   std::vector<PasswordForm*> native_forms;
   std::vector<PasswordForm> sync_forms;
   std::vector<PasswordForm> expected_forms;
   {
     PasswordForm* new_form = new PasswordForm;
     new_form->scheme = PasswordForm::SCHEME_HTML;
     new_form->signon_realm = "pie";
     new_form->origin = GURL("http://pie.com");
     new_form->action = GURL("http://pie.com/submit");
     new_form->username_element = UTF8ToUTF16("name");
@@ skipping 42 matching lines @@
                    base::Bind(&AddPasswordEntriesCallback, this, sync_forms));
 
   std::vector<PasswordForm> new_sync_forms;
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(2U, new_sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
   EXPECT_TRUE(ComparePasswords(expected_forms[1], new_sync_forms[1]));
 }
 
-TEST_F(ProfileSyncServicePasswordTest, HasNativeHasSyncMergeEntry) {
+TEST_F(ProfileSyncServicePasswordTest, MAYBE_HasNativeHasSyncMergeEntry) {
   std::vector<PasswordForm*> native_forms;
   std::vector<PasswordForm> sync_forms;
   std::vector<PasswordForm> expected_forms;
   {
     PasswordForm* new_form = new PasswordForm;
     new_form->scheme = PasswordForm::SCHEME_HTML;
     new_form->signon_realm = "pie";
     new_form->origin = GURL("http://pie.com");
     new_form->action = GURL("http://pie.com/submit");
     new_form->username_element = UTF8ToUTF16("name");
@@ skipping 50 matching lines @@
   CreateRootHelper create_root(this, syncer::PASSWORDS);
   StartSyncService(create_root.callback(),
                    base::Bind(&AddPasswordEntriesCallback, this, sync_forms));
 
   std::vector<PasswordForm> new_sync_forms;
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(1U, new_sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
 }