diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 19:25:57 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 19:25:57 +0000 |
| commit | 073f5c17903b727c2e3eed4d637d737943b8e95c (patch) | |
| tree | 2eb22056a95f2f1feb38e90e8c50af6a92430c24 /chrome/browser/sync | |
| parent | 6739bc6e6b9d7b66e011b3f6a26c9394aec2e268 (diff) | |
| download | chromium_src-073f5c17903b727c2e3eed4d637d737943b8e95c.zip chromium_src-073f5c17903b727c2e3eed4d637d737943b8e95c.tar.gz chromium_src-073f5c17903b727c2e3eed4d637d737943b8e95c.tar.bz2 | |
Reland: Fix and re-enable passwords sync perf test on Mac
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 on Mac.
BUG=105999
TEST=PasswordsSyncPerfTest.P0
Originally committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=116002
Reverted (due to failure in Win): http://codereview.chromium.org/8968037
Review URL: http://codereview.chromium.org/9052006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116166 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 | 6 |
1 files changed, 3 insertions, 3 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 fc986f1..ffd64e9 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 @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -71,8 +71,8 @@ std::string PasswordsSyncPerfTest::NextPassword() { return base::StringPrintf("password%d", password_number_++); } -// Flaky on Windows, timing out on Mac, see http://crbug.com/105999 -#if defined(OS_WIN) || defined(OS_MACOSX) +// Flaky on Windows, see http://crbug.com/105999 +#if defined(OS_WIN) #define MAYBE_P0 DISABLED_P0 #else #define MAYBE_P0 P0 |