From: Jason Dillaman Date: Thu, 12 Mar 2015 17:02:54 +0000 (-0400) Subject: test_cls_rbd: verify set_flags updates snapshots X-Git-Tag: v0.94~44^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba4bb22bc1522666174cbf010e6da6db37fcdffa;p=ceph.git test_cls_rbd: verify set_flags updates snapshots Signed-off-by: Jason Dillaman --- diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index dbb923001be0..6e910016fa12 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -1044,7 +1044,7 @@ TEST_F(TestClsRbd, flags) ASSERT_EQ(0U, flags); librados::ObjectWriteOperation op1; - set_flags(&op1, 3, 2); + set_flags(&op1, CEPH_NOSNAP, 3, 2); ASSERT_EQ(0, ioctx.operate(oid, &op1)); ASSERT_EQ(0, get_flags(&ioctx, oid, &flags, snap_ids, &snap_flags)); ASSERT_EQ(2U, flags); @@ -1055,12 +1055,12 @@ TEST_F(TestClsRbd, flags) ASSERT_EQ(0, snapshot_add(&ioctx, oid, snap_id, "snap")); librados::ObjectWriteOperation op2; - set_flags(&op2, 31, 4); + set_flags(&op2, snap_id, 31, 4); ASSERT_EQ(0, ioctx.operate(oid, &op2)); ASSERT_EQ(0, get_flags(&ioctx, oid, &flags, snap_ids, &snap_flags)); - ASSERT_EQ(6U, flags); + ASSERT_EQ(2U, flags); ASSERT_EQ(snap_ids.size(), snap_flags.size()); - ASSERT_EQ(2U, snap_flags[0]); + ASSERT_EQ(6U, snap_flags[0]); ioctx.close(); }