summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 22:26:39 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 22:26:39 +0000
commit2c40ca906d025d38855eac463c17cb8e9b7b412e (patch)
treeb87070e259c0137ea7715847319d54761d919cc1
parent562d71ef0d9bb578482240982a1f61a94f9f2e29 (diff)
downloadchromium_src-2c40ca906d025d38855eac463c17cb8e9b7b412e.zip
chromium_src-2c40ca906d025d38855eac463c17cb8e9b7b412e.tar.gz
chromium_src-2c40ca906d025d38855eac463c17cb8e9b7b412e.tar.bz2
Annotate a couple of failing sync integration tests.
Marking a couple of failing sync integration tests with the FAILS_prefix until the associated bugs are fixed. TwoClientLiveAutofillSyncTest.MergeProfiles TwoClientLivePasswordsSyncTest.SetPassphrase See http://build.chromium.org/buildbot/try-server/buildstatus?builder=linux_sync&number=267. TBR=tim@chromium.org BUG=59867,60368 TEST=sync_integration_tests Review URL: http://codereview.chromium.org/4079001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63579 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/live_sync/two_client_live_autofill_sync_test.cc3
-rw-r--r--chrome/test/live_sync/two_client_live_passwords_sync_test.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/test/live_sync/two_client_live_autofill_sync_test.cc b/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
index edda6a4..b8911f3 100644
--- a/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
@@ -418,7 +418,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, DeleteProfile) {
}
// TestScribe ID - 426760.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, MergeProfiles) {
+// Marked as FAILS -- see http://crbug.com/60368.
+IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, FAILS_MergeProfiles) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
AutoFillProfiles expected_profiles;
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 723ad44a..82a1291 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
@@ -67,7 +67,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, Race) {
EXPECT_TRUE(ContainsSamePasswordForms(actual_zero, actual_one));
}
-IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, SetPassphrase) {
+// Marked as FAILS -- see http://crbug.com/59867.
+IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, FAILS_SetPassphrase) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
GetClient(0)->service()->SetPassphrase(kValidPassphrase);
GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));