From: xinxin shu <xinxin.shu@intel.com>
Date: Mon, 17 Aug 2015 10:55:35 +0000 (+0800)
Subject: refine tests for metadata ops
X-Git-Tag: v9.1.0~184^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5592%2Fhead;p=ceph.git

refine tests for metadata ops

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
---

diff --git a/src/test/librbd/test_internal.cc b/src/test/librbd/test_internal.cc
index 0d909497953f..36a58f5f3551 100644
--- a/src/test/librbd/test_internal.cc
+++ b/src/test/librbd/test_internal.cc
@@ -377,39 +377,38 @@ TEST_F(TestInternal, MetadatConfig) {
     "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", false)(
     "cccccccccccccc", false);
   map<string, bool>::iterator it = test_confs.begin();
-  const string prefix = "test_config_";
-  bool is_continue;
+  int r;
   librbd::ImageCtx *ictx;
   ASSERT_EQ(0, open_image(m_image_name, &ictx));
 
-  librbd::Image image1;
-  map<string, bufferlist> pairs, res;
-  pairs[prefix+it->first].append("value1");
+  r = librbd::metadata_set(ictx, it->first, "value1");
+  ASSERT_EQ(0, r);
   ++it;
-  pairs[prefix+it->first].append("value2");
+  r = librbd::metadata_set(ictx, it->first, "value2");
+  ASSERT_EQ(0, r);
   ++it;
-  pairs[prefix+it->first].append("value3");
-  pairs[prefix+"asdfsdaf"].append("value6");
-  pairs[prefix+"zxvzxcv123"].append("value5");
-
-  is_continue = ictx->_filter_metadata_confs(prefix, test_confs, pairs, &res);
-  ASSERT_TRUE(is_continue);
-  ASSERT_TRUE(res.size() == 3U);
-  it = test_confs.begin();
-  ASSERT_TRUE(res.count(it->first));
-  ASSERT_TRUE(it->second);
-  ++it;
-  ASSERT_TRUE(res.count(it->first));
-  ASSERT_TRUE(it->second);
-  ++it;
-  ASSERT_TRUE(res.count(it->first));
-  ASSERT_TRUE(it->second);
-  res.clear();
-
-  pairs["zzzzzzzz"].append("value7");
-  is_continue = ictx->_filter_metadata_confs(prefix, test_confs, pairs, &res);
-  ASSERT_FALSE(is_continue);
-  ASSERT_TRUE(res.size() == 3U);
+  r = librbd::metadata_set(ictx, it->first, "value3");
+  ASSERT_EQ(0, r);
+  r = librbd::metadata_set(ictx, "abcd", "value4");
+  ASSERT_EQ(0, r);
+  r = librbd::metadata_set(ictx, "xyz", "value5");
+  ASSERT_EQ(0, r);
+  map<string, bufferlist> pairs;
+  r = librbd::metadata_list(ictx, "", 0, &pairs);
+  ASSERT_EQ(0, r);
+  ASSERT_EQ(5, pairs.size());
+  r = librbd::metadata_remove(ictx, "abcd");
+  ASSERT_EQ(0, r);
+  r = librbd::metadata_remove(ictx, "xyz");
+  ASSERT_EQ(0, r);
+  pairs.clear();
+  r = librbd::metadata_list(ictx, "", 0, &pairs);
+  ASSERT_EQ(0, r);
+  ASSERT_EQ(3, pairs.size());
+  string val;
+  r = librbd::metadata_get(ictx, it->first, &val);
+  ASSERT_EQ(0, r);
+  ASSERT_STREQ(val.c_str(), "value3");
 }
 
 TEST_F(TestInternal, SnapshotCopyup)