update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / test / rbd_mirror / image_map / test_Policy.cc

diff --git a/ceph/src/test/rbd_mirror/image_map/test_Policy.cc b/ceph/src/test/rbd_mirror/image_map/test_Policy.cc
index 4535ab7a59e28e5c8b8e8e93bacde4542ccd6ff5..5f8bdd17fbe1db39354551597b56610562ec1318 100644 (file)
--- a/ceph/src/test/rbd_mirror/image_map/test_Policy.cc
+++ b/ceph/src/test/rbd_mirror/image_map/test_Policy.cc
@@ -223,7 +223,7 @@ TEST_F(TestImageMapPolicy, MapFailureAndUnmap) {
                              &shuffle_global_image_ids);
   ASSERT_TRUE(shuffle_global_image_ids.empty());
 
-  ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLACKLISTED));
+  ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLOCKLISTED));
 
   ASSERT_EQ(ACTION_TYPE_RELEASE, m_policy->start_action(global_image_id));
   ASSERT_TRUE(m_policy->finish_action(global_image_id, -ENOENT));
@@ -278,7 +278,7 @@ TEST_F(TestImageMapPolicy, ReshuffleWithMapFailure) {
   m_policy->remove_instances({"9876"}, &shuffle_global_image_ids);
   ASSERT_TRUE(shuffle_global_image_ids.empty());
 
-  ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLACKLISTED));
+  ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLOCKLISTED));
 
   ASSERT_EQ(ACTION_TYPE_RELEASE, m_policy->start_action(global_image_id));
   ASSERT_TRUE(m_policy->finish_action(global_image_id, 0));
@@ -325,7 +325,7 @@ TEST_F(TestImageMapPolicy, ShuffleFailureAndRemove) {
   m_policy->remove_instances({"9876"}, &shuffle_global_image_ids);
   ASSERT_TRUE(shuffle_global_image_ids.empty());
 
-  ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLACKLISTED));
+  ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLOCKLISTED));
 
   ASSERT_EQ(ACTION_TYPE_RELEASE, m_policy->start_action(global_image_id));
   ASSERT_TRUE(m_policy->finish_action(global_image_id, 0));