summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 12:48:00 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 12:48:00 +0000
commit83c7ee874809518fbb13c055f0c1aa8d5de462d7 (patch)
tree3a8d03f9d99337c0363561096609087dd51ec3ca
parentbd0d0d901442bdf0509cd44bce32061578931316 (diff)
downloadchromium_src-83c7ee874809518fbb13c055f0c1aa8d5de462d7.zip
chromium_src-83c7ee874809518fbb13c055f0c1aa8d5de462d7.tar.gz
chromium_src-83c7ee874809518fbb13c055f0c1aa8d5de462d7.tar.bz2
Marking the correct test (...MultiProfileTest...) flaky.
Removing flaky marker from SSLClientCertificateSelectorTest.SelectDefault which I had accidentally marked (instead of the correct test) last week. TBR=mattm@chromium.org BUG=103534 Review URL: http://codereview.chromium.org/8564005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109870 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
index 2a6904c..25a28ea 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -272,8 +272,7 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, Escape) {
Mock::VerifyAndClear(auth_handler_);
}
-// http://crbug.com/103534
-IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, FLAKY_SelectDefault) {
+IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectDefault) {
EXPECT_CALL(*auth_handler_,
CertificateSelectedNoNotify(mit_davidben_cert_.get()));
@@ -346,8 +345,9 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest,
EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL));
}
+// http://crbug.com/103534
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest,
- SelectDefault) {
+ FLAKY_SelectDefault) {
EXPECT_CALL(*auth_handler_1_,
CertificateSelectedNoNotify(mit_davidben_cert_.get()));