diff options
| author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-30 02:53:41 +0000 |
|---|---|---|
| committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-30 02:53:41 +0000 |
| commit | de94eca00ab64e1fbb6bed1736a14e0f0f60aa0e (patch) | |
| tree | d256146f40a5a1e748dc2af677d15d3bc6d97c64 /chrome/browser/sync | |
| parent | 22b94fccf5a1854a7437f796f568e80cc79b061a (diff) | |
| download | chromium_src-de94eca00ab64e1fbb6bed1736a14e0f0f60aa0e.zip chromium_src-de94eca00ab64e1fbb6bed1736a14e0f0f60aa0e.tar.gz chromium_src-de94eca00ab64e1fbb6bed1736a14e0f0f60aa0e.tar.bz2 | |
Revert 116002 - Fix and re-enable passwords sync perf test
This appears to have broken a sync test on windows perf.
http://build.chromium.org/p/chromium.perf/builders/Vista%20Perf%20%282%29/builds/15149
The password sync perf test has been disabled on Mac for quite a while, because of the keychain prompts that used to pop up. The tests were made to use a MockKeychain implementation with http://codereview.chromium.org/9021004.
Yet, the tests were failing when several passwords were added because of a bug in the keychain, that would treat two usernames / domains / paths with the same prefix as equal, and therefore, treat them like duplicates in the keychain.
This patch fixes the bug by adding more stringent checks to the logic in MockKeychain that determines whether a password being added is in fact a duplicate or not. It also re-enables the perf test that was previously disabled.
BUG=105999
TEST=PasswordsSyncPerfTest.P0
Review URL: http://codereview.chromium.org/9052006
TBR=rsimha@chromium.org
Review URL: http://codereview.chromium.org/8968037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc index 8754d62..fc986f1 100644 --- a/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc @@ -71,7 +71,14 @@ std::string PasswordsSyncPerfTest::NextPassword() { return base::StringPrintf("password%d", password_number_++); } -IN_PROC_BROWSER_TEST_F(PasswordsSyncPerfTest, P0) { +// Flaky on Windows, timing out on Mac, see http://crbug.com/105999 +#if defined(OS_WIN) || defined(OS_MACOSX) +#define MAYBE_P0 DISABLED_P0 +#else +#define MAYBE_P0 P0 +#endif + +IN_PROC_BROWSER_TEST_F(PasswordsSyncPerfTest, MAYBE_P0) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; // TCM ID - 7367749. |