Merge "Fix failure in CowTest#InvalidMergeOrderTest." into main am: 243850ca5f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3353378

Change-Id: I9decd544d258404433776fb047709284d11c0271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-11-14 20:12:12 +00:00 committed by Automerger Merge Worker
commit 9591fb4e65

View file

@ -1487,7 +1487,7 @@ TEST_F(CowTest, InvalidMergeOrderTest) {
writer = std::make_unique<CowWriterV2>(options, GetCowFd());
ASSERT_TRUE(writer->Initialize());
ASSERT_TRUE(writer->AddCopy(2, 1));
ASSERT_TRUE(writer->AddXorBlocks(3, &data, data.size(), 1, 1));
ASSERT_TRUE(writer->AddXorBlocks(3, data.data(), data.size(), 1, 1));
ASSERT_TRUE(writer->Finalize());
ASSERT_TRUE(reader.Parse(cow_->fd));
ASSERT_FALSE(reader.VerifyMergeOps());