diff options
Diffstat (limited to 'pw_software_update/update_bundle_test.cc')
-rw-r--r-- | pw_software_update/update_bundle_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pw_software_update/update_bundle_test.cc b/pw_software_update/update_bundle_test.cc index c2bbf660e..e35987a38 100644 --- a/pw_software_update/update_bundle_test.cc +++ b/pw_software_update/update_bundle_test.cc @@ -69,7 +69,7 @@ class TestBundledUpdateBackend final : public BundledUpdateBackend { void SetManifestWriter(stream::Writer* writer) { manifest_writer_ = writer; } - virtual Result<stream::SeekableReader*> GetRootMetadataReader() override { + Result<stream::SeekableReader*> GetRootMetadataReader() override { return &trusted_root_reader_; } @@ -105,7 +105,7 @@ class TestBundledUpdateBackend final : public BundledUpdateBackend { return manifest_writer_; } - virtual Status SafelyPersistRootMetadata( + Status SafelyPersistRootMetadata( [[maybe_unused]] stream::IntervalReader root_metadata) override { new_root_persisted_ = true; trusted_root_reader_ = root_metadata; @@ -273,7 +273,7 @@ TEST_F(UpdateBundleTest, PersistManifestFailIfNotVerified) { TEST_F(UpdateBundleTest, SelfVerificationWithIncomingRoot) { StageTestBundle(kTestDevBundleWithRoot); UpdateBundleAccessor update_bundle( - blob_reader(), backend(), /* disable_verification = */ true); + blob_reader(), backend(), /* self_verification = */ true); ASSERT_OK(update_bundle.OpenAndVerify()); // Self verification must not persist anything. @@ -293,7 +293,7 @@ TEST_F(UpdateBundleTest, SelfVerificationWithIncomingRoot) { TEST_F(UpdateBundleTest, SelfVerificationWithoutIncomingRoot) { StageTestBundle(kTestDevBundle); UpdateBundleAccessor update_bundle( - blob_reader(), backend(), /* disable_verification = */ true); + blob_reader(), backend(), /* self_verification = */ true); ASSERT_OK(update_bundle.OpenAndVerify()); } @@ -301,7 +301,7 @@ TEST_F(UpdateBundleTest, SelfVerificationWithoutIncomingRoot) { TEST_F(UpdateBundleTest, SelfVerificationWithMessedUpRoot) { StageTestBundle(kTestDevBundleWithProdRoot); UpdateBundleAccessor update_bundle( - blob_reader(), backend(), /* disable_verification = */ true); + blob_reader(), backend(), /* self_verification = */ true); ASSERT_FAIL(update_bundle.OpenAndVerify()); } @@ -309,7 +309,7 @@ TEST_F(UpdateBundleTest, SelfVerificationWithMessedUpRoot) { TEST_F(UpdateBundleTest, SelfVerificationChecksMissingHashes) { StageTestBundle(kTestBundleMissingTargetHashFile0); UpdateBundleAccessor update_bundle( - blob_reader(), backend(), /* disable_verification = */ true); + blob_reader(), backend(), /* self_verification = */ true); ASSERT_FAIL(update_bundle.OpenAndVerify()); } @@ -317,7 +317,7 @@ TEST_F(UpdateBundleTest, SelfVerificationChecksMissingHashes) { TEST_F(UpdateBundleTest, SelfVerificationChecksBadHashes) { StageTestBundle(kTestBundleMismatchedTargetHashFile0); UpdateBundleAccessor update_bundle( - blob_reader(), backend(), /* disable_verification = */ true); + blob_reader(), backend(), /* self_verification = */ true); ASSERT_FAIL(update_bundle.OpenAndVerify()); } @@ -325,7 +325,7 @@ TEST_F(UpdateBundleTest, SelfVerificationChecksBadHashes) { TEST_F(UpdateBundleTest, SelfVerificationIgnoresUnsignedBundle) { StageTestBundle(kTestUnsignedBundleWithRoot); UpdateBundleAccessor update_bundle( - blob_reader(), backend(), /* disable_verification = */ true); + blob_reader(), backend(), /* self_verification = */ true); ASSERT_OK(update_bundle.OpenAndVerify()); } |