From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Sep 2015 17:47:55 +0000 (-0400)
Subject: ceph_test_libcephfs: remove remaining pool name assumptions
X-Git-Tag: v10.0.0~123^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6b9e85689dba066b17c3bbbeeea2681886896a7;p=ceph.git

ceph_test_libcephfs: remove remaining pool name assumptions

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/libcephfs/test.cc b/src/test/libcephfs/test.cc
index d49a64b0b6a..fe7e84a42f5 100644
--- a/src/test/libcephfs/test.cc
+++ b/src/test/libcephfs/test.cc
@@ -1133,8 +1133,10 @@ TEST(LibCephFS, GetPoolId) {
   ASSERT_EQ(ceph_conf_read_file(cmount, NULL), 0);
   ASSERT_EQ(ceph_mount(cmount, NULL), 0);
 
-  ASSERT_GE(ceph_get_pool_id(cmount, "data"), 0);
-  ASSERT_GE(ceph_get_pool_id(cmount, "metadata"), 0);
+  char name[80];
+  memset(name, 0, sizeof(name));
+  ASSERT_LE(0, ceph_get_path_pool_name(cmount, "/", name, sizeof(name)));
+  ASSERT_GE(ceph_get_pool_id(cmount, name), 0);
   ASSERT_EQ(ceph_get_pool_id(cmount, "weflkjwelfjwlkejf"), -ENOENT);
 
   ceph_shutdown(cmount);
@@ -1151,7 +1153,10 @@ TEST(LibCephFS, GetPoolReplication) {
   ASSERT_EQ(ceph_get_pool_replication(cmount, -10), -ENOENT);
 
   /* valid pool */
-  int pool_id = ceph_get_pool_id(cmount, "data");
+  int pool_id;
+  int stripe_unit, stripe_count, object_size;
+  ASSERT_EQ(0, ceph_get_path_layout(cmount, "/", &stripe_unit, &stripe_count,
+				    &object_size, &pool_id));
   ASSERT_GE(pool_id, 0);
   ASSERT_GT(ceph_get_pool_replication(cmount, pool_id), 0);