From: Sunny Kumar <sunkumar@redhat.com>
Date: Tue, 15 Jun 2021 13:19:44 +0000 (+0100)
Subject: test/librbd: add test condition for whole-object switch with fast diff enable
X-Git-Tag: v17.1.0~613^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d62c4adf74d2aee02f12bc1955490175b55bfda;p=ceph.git

test/librbd: add test condition for whole-object switch with fast diff enable

This patch adds a test condition to test fast diff between two snapshots
with whole-object switch.

`TestMockObjectMapDiffRequest.EndDelta` expects diff state
`DIFF_STATE_DATA_UPDATED` which is an incorrect expectation when diff is calculated
between two snapshots.

Fixes: https://tracker.ceph.com/issues/50787

Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
---

diff --git a/src/test/librbd/object_map/test_mock_DiffRequest.cc b/src/test/librbd/object_map/test_mock_DiffRequest.cc
index f90d488a555b..c25ae4a95c5e 100644
--- a/src/test/librbd/object_map/test_mock_DiffRequest.cc
+++ b/src/test/librbd/object_map/test_mock_DiffRequest.cc
@@ -212,7 +212,7 @@ TEST_F(TestMockObjectMapDiffRequest, IntermediateDelta) {
 
   BitVector<2> object_map_1;
   object_map_1.resize(object_count);
-  object_map_1[1] = OBJECT_EXISTS_CLEAN;
+  object_map_1[1] = OBJECT_EXISTS;
   object_map_1[2] = OBJECT_EXISTS_CLEAN;
   expect_load_map(mock_image_ctx, 1U, object_map_1, 0);
 
@@ -281,7 +281,7 @@ TEST_F(TestMockObjectMapDiffRequest, EndDelta) {
   BitVector<2> expected_diff_state;
   expected_diff_state.resize(object_count);
   expected_diff_state[1] = DIFF_STATE_DATA;
-  expected_diff_state[2] = DIFF_STATE_DATA_UPDATED;
+  expected_diff_state[2] = DIFF_STATE_DATA;
   expected_diff_state[3] = DIFF_STATE_HOLE_UPDATED;
   ASSERT_EQ(expected_diff_state, m_object_diff_state);
 }