Skip to content

GitLab

T
tangled
Commit ff168dcc authored by Matt Mueller's avatar Matt Mueller Committed by Commit Bot
Browse files
Options

TrialComparisonCertVerifierTest: Use DATE_INVALID instead of REVOKED 

The REVOKED status can trigger some of the difference-ignorers that
will be added in followups.

Bug: 649026
Change-Id: I099402d188a7819aaee229a52327187620146434
Reviewed-on: https://chromium-review.googlesource.com/1079705Reviewed-by: default avatarEric Roman <eroman@chromium.org>
Commit-Queue: Matt Mueller <mattm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563142}
parent 5ef1aba1
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
chrome/browser/net/trial_comparison_cert_verifier_unittest.cc
View file @ ff168dcc
...@@ -451,9 +451,9 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierErrorSecondaryOk) { ...@@ -451,9 +451,9 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierErrorSecondaryOk) {
// Primary verifier returns an error status. // Primary verifier returns an error status.
net::CertVerifyResult primary_result; net::CertVerifyResult primary_result;
primary_result.verified_cert = cert_chain_1_; primary_result.verified_cert = cert_chain_1_;
primary_result.cert_status = net::CERT_STATUS_REVOKED; primary_result.cert_status = net::CERT_STATUS_DATE_INVALID;
scoped_refptr<MockCertVerifyProc> verify_proc1 = scoped_refptr<MockCertVerifyProc> verify_proc1 =
base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_REVOKED, base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_DATE_INVALID,
primary_result); primary_result);
net::CertVerifyResult secondary_result; net::CertVerifyResult secondary_result;
...@@ -476,7 +476,7 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierErrorSecondaryOk) { ...@@ -476,7 +476,7 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierErrorSecondaryOk) {
EXPECT_TRUE(request); EXPECT_TRUE(request);
error = callback.WaitForResult(); error = callback.WaitForResult();
EXPECT_THAT(error, IsError(net::ERR_CERT_REVOKED)); EXPECT_THAT(error, IsError(net::ERR_CERT_DATE_INVALID));
verify_proc2->WaitForVerifyCall(); verify_proc2->WaitForVerifyCall();
...@@ -492,7 +492,7 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierErrorSecondaryOk) { ...@@ -492,7 +492,7 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierErrorSecondaryOk) {
ASSERT_TRUE(report.ParseFromString(full_reports[0])); ASSERT_TRUE(report.ParseFromString(full_reports[0]));
ASSERT_EQ(1, report.cert_error_size()); ASSERT_EQ(1, report.cert_error_size());
EXPECT_EQ(chrome_browser_ssl::CertLoggerRequest::ERR_CERT_REVOKED, EXPECT_EQ(chrome_browser_ssl::CertLoggerRequest::ERR_CERT_DATE_INVALID,
report.cert_error()[0]); report.cert_error()[0]);
EXPECT_EQ(0, report.cert_status_size()); EXPECT_EQ(0, report.cert_status_size());
...@@ -524,10 +524,10 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierOkSecondaryError) { ...@@ -524,10 +524,10 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierOkSecondaryError) {
// Trial verifier returns an error status. // Trial verifier returns an error status.
net::CertVerifyResult secondary_result; net::CertVerifyResult secondary_result;
secondary_result.cert_status = net::CERT_STATUS_REVOKED; secondary_result.cert_status = net::CERT_STATUS_DATE_INVALID;
secondary_result.verified_cert = cert_chain_1_; secondary_result.verified_cert = cert_chain_1_;
scoped_refptr<MockCertVerifyProc> verify_proc2 = scoped_refptr<MockCertVerifyProc> verify_proc2 =
base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_REVOKED, base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_DATE_INVALID,
secondary_result); secondary_result);
TrialComparisonCertVerifier verifier(profile(), verify_proc1, verify_proc2); TrialComparisonCertVerifier verifier(profile(), verify_proc1, verify_proc2);
...@@ -568,7 +568,7 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierOkSecondaryError) { ...@@ -568,7 +568,7 @@ TEST_F(TrialComparisonCertVerifierTest, PrimaryVerifierOkSecondaryError) {
const chrome_browser_ssl::TrialVerificationInfo& trial_info = const chrome_browser_ssl::TrialVerificationInfo& trial_info =
report.features_info().trial_verification_info(); report.features_info().trial_verification_info();
ASSERT_EQ(1, trial_info.cert_error_size()); ASSERT_EQ(1, trial_info.cert_error_size());
EXPECT_EQ(chrome_browser_ssl::CertLoggerRequest::ERR_CERT_REVOKED, EXPECT_EQ(chrome_browser_ssl::CertLoggerRequest::ERR_CERT_DATE_INVALID,
trial_info.cert_error()[0]); trial_info.cert_error()[0]);
EXPECT_EQ(0, trial_info.cert_status_size()); EXPECT_EQ(0, trial_info.cert_status_size());
...@@ -738,9 +738,9 @@ TEST_F(TrialComparisonCertVerifierTest, Coalescing) { ...@@ -738,9 +738,9 @@ TEST_F(TrialComparisonCertVerifierTest, Coalescing) {
// Primary verifier returns an error status. // Primary verifier returns an error status.
net::CertVerifyResult primary_result; net::CertVerifyResult primary_result;
primary_result.verified_cert = cert_chain_1_; primary_result.verified_cert = cert_chain_1_;
primary_result.cert_status = net::CERT_STATUS_REVOKED; primary_result.cert_status = net::CERT_STATUS_DATE_INVALID;
scoped_refptr<MockCertVerifyProc> verify_proc1 = scoped_refptr<MockCertVerifyProc> verify_proc1 =
base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_REVOKED, base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_DATE_INVALID,
primary_result); primary_result);
// Trial verifier has ok status. // Trial verifier has ok status.
...@@ -777,9 +777,9 @@ TEST_F(TrialComparisonCertVerifierTest, Coalescing) { ...@@ -777,9 +777,9 @@ TEST_F(TrialComparisonCertVerifierTest, Coalescing) {
// Both callbacks should be called with same error code. // Both callbacks should be called with same error code.
error = callback_1.WaitForResult(); error = callback_1.WaitForResult();
EXPECT_THAT(error, IsError(net::ERR_CERT_REVOKED)); EXPECT_THAT(error, IsError(net::ERR_CERT_DATE_INVALID));
error = callback_2.WaitForResult(); error = callback_2.WaitForResult();
EXPECT_THAT(error, IsError(net::ERR_CERT_REVOKED)); EXPECT_THAT(error, IsError(net::ERR_CERT_DATE_INVALID));
// Trial verifier should run. // Trial verifier should run.
verify_proc2->WaitForVerifyCall(); verify_proc2->WaitForVerifyCall();
...@@ -796,7 +796,7 @@ TEST_F(TrialComparisonCertVerifierTest, Coalescing) { ...@@ -796,7 +796,7 @@ TEST_F(TrialComparisonCertVerifierTest, Coalescing) {
ASSERT_TRUE(report.ParseFromString(full_reports[0])); ASSERT_TRUE(report.ParseFromString(full_reports[0]));
ASSERT_EQ(1, report.cert_error_size()); ASSERT_EQ(1, report.cert_error_size());
EXPECT_EQ(chrome_browser_ssl::CertLoggerRequest::ERR_CERT_REVOKED, EXPECT_EQ(chrome_browser_ssl::CertLoggerRequest::ERR_CERT_DATE_INVALID,
report.cert_error()[0]); report.cert_error()[0]);
EXPECT_EQ(0, report.cert_status_size()); EXPECT_EQ(0, report.cert_status_size());
...@@ -826,9 +826,9 @@ TEST_F(TrialComparisonCertVerifierTest, CancelledDuringPrimaryVerification) { ...@@ -826,9 +826,9 @@ TEST_F(TrialComparisonCertVerifierTest, CancelledDuringPrimaryVerification) {
// Primary verifier returns an error status. // Primary verifier returns an error status.
net::CertVerifyResult primary_result; net::CertVerifyResult primary_result;
primary_result.verified_cert = cert_chain_1_; primary_result.verified_cert = cert_chain_1_;
primary_result.cert_status = net::CERT_STATUS_REVOKED; primary_result.cert_status = net::CERT_STATUS_DATE_INVALID;
scoped_refptr<MockCertVerifyProc> verify_proc1 = scoped_refptr<MockCertVerifyProc> verify_proc1 =
base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_REVOKED, base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_DATE_INVALID,
primary_result); primary_result);
// Trial verifier has ok status. // Trial verifier has ok status.
...@@ -871,7 +871,7 @@ TEST_F(TrialComparisonCertVerifierTest, CancelledDuringPrimaryVerification) { ...@@ -871,7 +871,7 @@ TEST_F(TrialComparisonCertVerifierTest, CancelledDuringPrimaryVerification) {
ASSERT_TRUE(report.ParseFromString(full_reports[0])); ASSERT_TRUE(report.ParseFromString(full_reports[0]));
ASSERT_EQ(1, report.cert_error_size()); ASSERT_EQ(1, report.cert_error_size());
EXPECT_EQ(chrome_browser_ssl::CertLoggerRequest::ERR_CERT_REVOKED, EXPECT_EQ(chrome_browser_ssl::CertLoggerRequest::ERR_CERT_DATE_INVALID,
report.cert_error()[0]); report.cert_error()[0]);
EXPECT_EQ(0, report.cert_status_size()); EXPECT_EQ(0, report.cert_status_size());
...@@ -899,9 +899,9 @@ TEST_F(TrialComparisonCertVerifierTest, DeletedDuringPrimaryVerification) { ...@@ -899,9 +899,9 @@ TEST_F(TrialComparisonCertVerifierTest, DeletedDuringPrimaryVerification) {
// Primary verifier returns an error status. // Primary verifier returns an error status.
net::CertVerifyResult primary_result; net::CertVerifyResult primary_result;
primary_result.verified_cert = cert_chain_1_; primary_result.verified_cert = cert_chain_1_;
primary_result.cert_status = net::CERT_STATUS_REVOKED; primary_result.cert_status = net::CERT_STATUS_DATE_INVALID;
scoped_refptr<MockCertVerifyProc> verify_proc1 = scoped_refptr<MockCertVerifyProc> verify_proc1 =
base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_REVOKED, base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_DATE_INVALID,
primary_result); primary_result);
auto verifier = std::make_unique<TrialComparisonCertVerifier>( auto verifier = std::make_unique<TrialComparisonCertVerifier>(
...@@ -943,9 +943,9 @@ TEST_F(TrialComparisonCertVerifierTest, DeletedDuringTrialVerification) { ...@@ -943,9 +943,9 @@ TEST_F(TrialComparisonCertVerifierTest, DeletedDuringTrialVerification) {
// Primary verifier returns an error status. // Primary verifier returns an error status.
net::CertVerifyResult primary_result; net::CertVerifyResult primary_result;
primary_result.verified_cert = cert_chain_1_; primary_result.verified_cert = cert_chain_1_;
primary_result.cert_status = net::CERT_STATUS_REVOKED; primary_result.cert_status = net::CERT_STATUS_DATE_INVALID;
scoped_refptr<MockCertVerifyProc> verify_proc1 = scoped_refptr<MockCertVerifyProc> verify_proc1 =
base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_REVOKED, base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_DATE_INVALID,
primary_result); primary_result);
// Trial verifier has ok status. // Trial verifier has ok status.
...@@ -971,7 +971,7 @@ TEST_F(TrialComparisonCertVerifierTest, DeletedDuringTrialVerification) { ...@@ -971,7 +971,7 @@ TEST_F(TrialComparisonCertVerifierTest, DeletedDuringTrialVerification) {
// Wait for primary verifier to finish. // Wait for primary verifier to finish.
error = callback.WaitForResult(); error = callback.WaitForResult();
EXPECT_THAT(error, IsError(net::ERR_CERT_REVOKED)); EXPECT_THAT(error, IsError(net::ERR_CERT_DATE_INVALID));
// Delete the TrialComparisonCertVerifier. // Delete the TrialComparisonCertVerifier.
verifier.reset(); verifier.reset();
...@@ -1009,10 +1009,10 @@ TEST_F(TrialComparisonCertVerifierTest, ...@@ -1009,10 +1009,10 @@ TEST_F(TrialComparisonCertVerifierTest,
// Trial verifier returns an error status. // Trial verifier returns an error status.
net::CertVerifyResult secondary_result; net::CertVerifyResult secondary_result;
secondary_result.cert_status = net::CERT_STATUS_REVOKED; secondary_result.cert_status = net::CERT_STATUS_DATE_INVALID;
secondary_result.verified_cert = cert_chain_1_; secondary_result.verified_cert = cert_chain_1_;
scoped_refptr<MockCertVerifyProc> verify_proc2 = scoped_refptr<MockCertVerifyProc> verify_proc2 =
base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_REVOKED, base::MakeRefCounted<MockCertVerifyProc>(net::ERR_CERT_DATE_INVALID,
secondary_result); secondary_result);
TrialComparisonCertVerifier verifier(profile(), verify_proc1, verify_proc2); TrialComparisonCertVerifier verifier(profile(), verify_proc1, verify_proc2);
......
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