diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 23:44:52 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 23:44:52 +0000 |
| commit | b5418104fc64264f89ce2147fa8d9b443339e21d (patch) | |
| tree | af050c619400c5c8fbd5c6f9c9dd14b2a9910782 | |
| parent | d30d42e6099d682d67afad58275bcfba97e2652e (diff) | |
| download | chromium_src-b5418104fc64264f89ce2147fa8d9b443339e21d.zip chromium_src-b5418104fc64264f89ce2147fa8d9b443339e21d.tar.gz chromium_src-b5418104fc64264f89ce2147fa8d9b443339e21d.tar.bz2 | |
Mark TwoClientLivePasswordsSyncTest.Merge as FLAKY.
BUG=90460
TEST=none
Review URL: http://codereview.chromium.org/7464049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93993 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/live_sync/two_client_live_passwords_sync_test.cc | 3 |
1 files changed, 2 insertions, 1 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 d47cf52..360fe38 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 @@ -179,7 +179,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, DeleteAll) { } // TCM ID - 3694311 -IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, Merge) { +// http://crbug.com/90460 +IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, FLAKY_Merge) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier()); |