From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 3 Feb 2015 01:10:19 +0000 (-0800)
Subject: test/cls_rgw: fix test
X-Git-Tag: v0.93~121^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3594%2Fhead;p=ceph.git

test/cls_rgw: fix test

Test needed to be updated, now using meta.accounted_size for object
size.

Fixes: #10707

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/test/cls_rgw/test_cls_rgw.cc b/src/test/cls_rgw/test_cls_rgw.cc
index 64845a0b2fa0..22f137dd284f 100644
--- a/src/test/cls_rgw/test_cls_rgw.cc
+++ b/src/test/cls_rgw/test_cls_rgw.cc
@@ -99,6 +99,7 @@ void index_complete(OpMgr& mgr, librados::IoCtx& ioctx, string& oid, RGWModifyOp
   rgw_bucket_entry_ver ver;
   ver.pool = ioctx.get_id();
   ver.epoch = epoch;
+  meta.accounted_size = meta.size;
   cls_rgw_bucket_complete_op(*op, index_op, tag, ver, key, meta, NULL, true, 0);
   ASSERT_EQ(0, ioctx.operate(oid, op));
 }
@@ -346,6 +347,7 @@ TEST(cls_rgw, index_suggest)
     dirent.locator = loc;
     dirent.exists = (i < num_objs / 2); // we removed half the objects
     dirent.meta.size = 1024;
+    dirent.meta.accounted_size = 1024;
 
     char suggest_op = (i < num_objs / 2 ? CEPH_RGW_UPDATE : CEPH_RGW_REMOVE);
     cls_rgw_encode_suggestion(suggest_op, dirent, updates);