From f03fee0abad67d83cd94526b4a670870b2ddba1e Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 19 Jan 2022 21:56:05 +0000 Subject: [PATCH] test/bufferlist: assert the rebuild in rebuild_aligned_size_and_memory() actually happens. For the investigation of failures like the following one: ``` [ RUN ] BufferList.rebuild_aligned_size_and_memory ../src/test/bufferlist.cc:1865: Failure Expected equality of these values: bl.get_num_buffers() Which is: 2 1 [ FAILED ] BufferList.rebuild_aligned_size_and_memory (0 ms) ``` The test case assumes the rebuild before the failed clause **always** happens while `bufferlist::rebuild_aligned_size_and_memory()` skips it if buffers are already aligned. Signed-off-by: Radoslaw Zarzynski (cherry picked from commit 2de5f17647437d8f67adfe79becbb0e280f7f26f) --- src/test/bufferlist.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc index 3a942854f5faa..a76dfbd44b514 100644 --- a/src/test/bufferlist.cc +++ b/src/test/bufferlist.cc @@ -1667,8 +1667,9 @@ TEST(BufferList, rebuild_aligned_size_and_memory) { bl.append(ptr, 0, 0); EXPECT_EQ(bl.get_num_buffers(), 2); EXPECT_EQ(bl.back().length(), 0); - /* rebuild_aligned() calls rebuild_aligned_size_and_memory() */ - bl.rebuild_aligned(4096); + /* rebuild_aligned() calls rebuild_aligned_size_and_memory(). + * we assume the rebuild always happens. */ + EXPECT_TRUE(bl.rebuild_aligned(4096)); EXPECT_EQ(bl.get_num_buffers(), 1); } } -- 2.39.5