From 8c8a917093d4bdf325eccc58b4b6fb54364715a1 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 25 Aug 2015 16:02:28 -0400 Subject: [PATCH] tests: update cls_rbd test for async dir_rename_image method Signed-off-by: Jason Dillaman --- src/test/cls_rbd/test_cls_rbd.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index 24dd38edc3369..6d5fb8bc00f4e 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -307,20 +307,28 @@ TEST_F(TestClsRbd, directory_methods) ASSERT_EQ(0, dir_get_id(&ioctx, oid, imgname2, &id)); ASSERT_EQ(valid_id2, id); - ASSERT_EQ(-ESTALE, dir_rename_image(&ioctx, oid, imgname, imgname2, valid_id2)); + librados::ObjectWriteOperation op1; + dir_rename_image(&op1, imgname, imgname2, valid_id2); + ASSERT_EQ(-ESTALE, ioctx.operate(oid, &op1)); ASSERT_EQ(-ESTALE, dir_remove_image(&ioctx, oid, imgname, valid_id2)); - ASSERT_EQ(-EEXIST, dir_rename_image(&ioctx, oid, imgname, imgname2, valid_id)); + librados::ObjectWriteOperation op2; + dir_rename_image(&op2, imgname, imgname2, valid_id); + ASSERT_EQ(-EEXIST, ioctx.operate(oid, &op2)); ASSERT_EQ(0, dir_get_id(&ioctx, oid, imgname, &id)); ASSERT_EQ(valid_id, id); ASSERT_EQ(0, dir_get_name(&ioctx, oid, valid_id2, &name)); ASSERT_EQ(imgname2, name); - ASSERT_EQ(0, dir_rename_image(&ioctx, oid, imgname, imgname3, valid_id)); + librados::ObjectWriteOperation op3; + dir_rename_image(&op3, imgname, imgname3, valid_id); + ASSERT_EQ(0, ioctx.operate(oid, &op3)); ASSERT_EQ(0, dir_get_id(&ioctx, oid, imgname3, &id)); ASSERT_EQ(valid_id, id); ASSERT_EQ(0, dir_get_name(&ioctx, oid, valid_id, &name)); ASSERT_EQ(imgname3, name); - ASSERT_EQ(0, dir_rename_image(&ioctx, oid, imgname3, imgname, valid_id)); + librados::ObjectWriteOperation op4; + dir_rename_image(&op4, imgname3, imgname, valid_id); + ASSERT_EQ(0, ioctx.operate(oid, &op4)); ASSERT_EQ(0, dir_remove_image(&ioctx, oid, imgname, valid_id)); ASSERT_EQ(0, dir_list(&ioctx, oid, "", 30, &images)); -- 2.39.5