diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 00:30:15 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 00:30:15 +0000 |
| commit | 93a1f0ee89ce69fe2de3a223e8dee6a87cbb205e (patch) | |
| tree | 8e6c6811b6f3578226a6de97790e674a48e51cbd | |
| parent | 498d7d1f63ebb3585d3d2273e2925c6ef852d6d3 (diff) | |
| download | chromium_src-93a1f0ee89ce69fe2de3a223e8dee6a87cbb205e.zip chromium_src-93a1f0ee89ce69fe2de3a223e8dee6a87cbb205e.tar.gz chromium_src-93a1f0ee89ce69fe2de3a223e8dee6a87cbb205e.tar.bz2 | |
Disabling a couple of failing passphrase sync tests.
There is an occasional failure in the passphrase sync tests. Disabling
them until the cause is investigated, since they are causing redness in
the bots.
TBR=tim@chromium.org
BUG=67862
TEST=sync_integration_tests
Review URL: http://codereview.chromium.org/6045006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70008 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/live_sync/two_client_live_passwords_sync_test.cc | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/chrome/test/live_sync/two_client_live_passwords_sync_test.cc b/chrome/test/live_sync/two_client_live_passwords_sync_test.cc index f48363d..a4299af 100644 --- a/chrome/test/live_sync/two_client_live_passwords_sync_test.cc +++ b/chrome/test/live_sync/two_client_live_passwords_sync_test.cc @@ -125,14 +125,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, num_conflicting_updates); } -// TODO(sync): Remove FAILS_ annotation after http://crbug.com/59867 is fixed. -#if defined(OS_MACOSX) +// TODO(sync): Remove DISABLED_ annotation after http://crbug.com/59867 and +// http://crbug.com/67862 are fixed. IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, - FAILS_SetPassphraseAndThenSetupSync) { -#else -IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, - SetPassphraseAndThenSetupSync) { -#endif + DISABLED_SetPassphraseAndThenSetupSync) { ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; ASSERT_TRUE(GetClient(0)->SetupSync()); GetClient(0)->service()->SetPassphrase(kValidPassphrase, true); @@ -147,14 +143,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required()); } -// TODO(sync): Remove FAILS_ annotation after http://crbug.com/59867 is fixed. -#if defined(OS_MACOSX) +// TODO(sync): Remove DISABLED_ annotation after http://crbug.com/59867 and +// http://crbug.com/67862 are fixed. IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, - FAILS_SetPassphraseTwice) { -#else -IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, - SetPassphraseTwice) { -#endif + DISABLED_SetPassphraseTwice) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; GetClient(0)->service()->SetPassphrase(kValidPassphrase, true); |