Commit 176f0f60 authored by John Abd-El-Malek's avatar John Abd-El-Malek Committed by Commit Bot

Fix assert because of disk IO in SSLUITestNoCert.NewCertificateAuthority.

r603810 recently turned on the IO checks for ChromeOS browser tests.

Change-Id: Iaf3c654361a0502d5069a5e90a494d78df90ee90
Reviewed-on: https://chromium-review.googlesource.com/c/1329882Reviewed-by: default avatarRobbie McElrath <rmcelrath@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606929}
parent 308dc79f
......@@ -6129,13 +6129,18 @@ IN_PROC_BROWSER_TEST_P(SSLUITestNoCert, NewCertificateAuthority) {
}));
run_loop.Run();
scoped_refptr<net::X509Certificate> cert =
net::CreateCertificateChainFromFile(
net::GetTestCertsDirectory(), "root_ca_cert.pem",
net::X509Certificate::FORMAT_PEM_CERT_SEQUENCE);
scoped_refptr<net::X509Certificate> cert;
net::ScopedCERTCertificateList nss_certs;
{
base::ScopedAllowBlockingForTesting allow_io;
cert = net::CreateCertificateChainFromFile(
net::GetTestCertsDirectory(), "root_ca_cert.pem",
net::X509Certificate::FORMAT_PEM_CERT_SEQUENCE);
net::ScopedCERTCertificateList nss_certs =
net::x509_util::CreateCERTCertificateListFromX509Certificate(cert.get());
nss_certs = net::x509_util::CreateCERTCertificateListFromX509Certificate(
cert.get());
}
net::NSSCertDatabase::ImportCertFailureList not_imported;
EXPECT_TRUE(model->ImportCACerts(nss_certs, net::NSSCertDatabase::TRUSTED_SSL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment