]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: relax diff_iterate discard test
authorJason Dillaman <dillaman@redhat.com>
Thu, 26 Mar 2015 02:40:17 +0000 (22:40 -0400)
committerJason Dillaman <dillaman@redhat.com>
Mon, 13 Apr 2015 19:24:15 +0000 (15:24 -0400)
The fast diff algorithm can only flag an object as deleted if
the full object is discarded -- not just a small section.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/test/librbd/test_librbd.cc

index 66bf4901572b12f04037f6054aee3ac20f67582c..ea6009ec60d02c77a5952045b60265094bc3e655 100644 (file)
@@ -2185,7 +2185,7 @@ TYPED_TEST(DiffIterateTest, DiffIterateDiscard)
   ASSERT_EQ(diff_extent(0, 256, true, object_size), extents[0]);
 
   int obj_ofs = 256;
-  ASSERT_EQ(obj_ofs, image.discard(0, obj_ofs));
+  ASSERT_EQ(1 << order, image.discard(0, 1 << order));
 
   extents.clear();
   ASSERT_EQ(0, image.diff_iterate2(NULL, 0, size, true, this->whole_object,