diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 09:47:16 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 09:47:16 +0000 |
| commit | 122573c1978388209147eb14879a7694c86a586b (patch) | |
| tree | e61c8f7aab1665ab011e0926c35fb207c8370c93 | |
| parent | 227183e2e35ac7a5521b56400be53a40339e623f (diff) | |
| download | chromium_src-122573c1978388209147eb14879a7694c86a586b.zip chromium_src-122573c1978388209147eb14879a7694c86a586b.tar.gz chromium_src-122573c1978388209147eb14879a7694c86a586b.tar.bz2 | |
[sync] Re-enable TwoClientPasswords.SetPassphraseAndThenSetupSync
TwoClientPasswords.SetPassphraseAndThenSetupSync was flaky a few months
ago, and disabled as a result. Running it against ToT on win, mac and
linux with large gtest_repeat values yields a 100% pass rate.
This patch re-enables the test.
BUG=135336
TEST=sync_integration_tests:TwoClientPasswords.SetPassphraseAndThenSetupSync
Review URL: https://chromiumcodereview.appspot.com/12572004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188569 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc index fbb7580..0631125 100644 --- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc @@ -229,9 +229,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, Merge) { ASSERT_TRUE(AllProfilesContainSamePasswordForms()); } -// This test is flaky. See bug http://crbug.com/135336 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, - DISABLED_SetPassphraseAndThenSetupSync) { + SetPassphraseAndThenSetupSync) { ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; ASSERT_TRUE(GetClient(0)->SetupSync()); |