summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 14:54:08 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 14:54:08 +0000
commitab63c4781a5d2cd898364677bb21a0d62de9173d (patch)
treeebda8846be78343fbfd49cc7a1507e7b80d96d51 /net/base
parentce636a5f9eb63f654573988b09d19407776c6478 (diff)
downloadchromium_src-ab63c4781a5d2cd898364677bb21a0d62de9173d.zip
chromium_src-ab63c4781a5d2cd898364677bb21a0d62de9173d.tar.gz
chromium_src-ab63c4781a5d2cd898364677bb21a0d62de9173d.tar.bz2
net: reenable TestKnownRoots
(disabled in r80801) I can't find anything wrong with it with Valgrind so I want to see if the TSAN blowup was a fluke. BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/x509_certificate_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/base/x509_certificate_unittest.cc b/net/base/x509_certificate_unittest.cc
index eb52522..c7dd8fb 100644
--- a/net/base/x509_certificate_unittest.cc
+++ b/net/base/x509_certificate_unittest.cc
@@ -481,8 +481,7 @@ TEST(X509CertificateTest, IntermediateCARequireExplicitPolicy) {
root_certs->Clear();
}
-// agl: disabled because it hung the TSAN bots.
-TEST(X509CertificateTest, DISABLED_TestKnownRoot) {
+TEST(X509CertificateTest, TestKnownRoot) {
FilePath certs_dir = GetTestCertsDirectory();
scoped_refptr<X509Certificate> cert =
ImportCertFromFile(certs_dir, "nist.der");