config: fix librados, libcephfs unit tests

No more g_conf->debug.

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

diff --git a/src/test/libcephfs_config.cc b/src/test/libcephfs_config.cc
index c5e184f59c4f0cf4f48764913266042ee771bb3b..0d908b8f64d54f80accf849e52184b3e71cc22c8 100644 (file)
--- a/src/test/libcephfs_config.cc
+++ b/src/test/libcephfs_config.cc
@@ -26,12 +26,12 @@ TEST(LibCephConfig, SimpleSet) {
   int ret = ceph_create(&cmount, NULL);
   ASSERT_EQ(ret, 0);
 
-  ret = ceph_conf_set(cmount, "debug", "21");
+  ret = ceph_conf_set(cmount, "max_open_files", "21");
   ASSERT_EQ(ret, 0);
 
   char buf[128];
   memset(buf, 0, sizeof(buf));
-  ret = ceph_conf_get(cmount, "debug", buf, sizeof(buf));
+  ret = ceph_conf_get(cmount, "max_open_files", buf, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("21"), string(buf));
 
@@ -43,7 +43,7 @@ TEST(LibCephConfig, ArgV) {
   int ret = ceph_create(&cmount, NULL);
   ASSERT_EQ(ret, 0);
 
-  const char *argv[] = { "foo", "--debug", "2",
+  const char *argv[] = { "foo", "--max-open-files", "2",
                         "--keyfile", "/tmp/my-keyfile", NULL };
   size_t argc = (sizeof(argv) / sizeof(argv[0])) - 1;
   ceph_conf_parse_argv(cmount, argc, argv);
@@ -55,7 +55,7 @@ TEST(LibCephConfig, ArgV) {
   ASSERT_EQ(string("/tmp/my-keyfile"), string(buf));
 
   memset(buf, 0, sizeof(buf));
-  ret = ceph_conf_get(cmount, "debug", buf, sizeof(buf));
+  ret = ceph_conf_get(cmount, "max_open_files", buf, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("2"), string(buf));
 

diff --git a/src/test/librados_config.cc b/src/test/librados_config.cc
index afb5efcc730e6c8c3536c27a3e70194b6f36c1f2..87fd67776e2c489e5df0bf72421c239bfa3f8633 100644 (file)
--- a/src/test/librados_config.cc
+++ b/src/test/librados_config.cc
@@ -26,12 +26,12 @@ TEST(LibRadosConfig, SimpleSet) {
   int ret = rados_create(&cl, NULL);
   ASSERT_EQ(ret, 0);
 
-  ret = rados_conf_set(cl, "debug", "21");
+  ret = rados_conf_set(cl, "max_open_files", "21");
   ASSERT_EQ(ret, 0);
 
   char buf[128];
   memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "debug", buf, sizeof(buf));
+  ret = rados_conf_get(cl, "max_open_files", buf, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("21"), string(buf));
 
@@ -43,7 +43,7 @@ TEST(LibRadosConfig, ArgV) {
   int ret = rados_create(&cl, NULL);
   ASSERT_EQ(ret, 0);
 
-  const char *argv[] = { "foo", "--debug", "2",
+  const char *argv[] = { "foo", "--max-open-files", "2",
                         "--keyfile", "/tmp/my-keyfile", NULL };
   size_t argc = (sizeof(argv) / sizeof(argv[0])) - 1;
   rados_conf_parse_argv(cl, argc, argv);
@@ -55,7 +55,7 @@ TEST(LibRadosConfig, ArgV) {
   ASSERT_EQ(string("/tmp/my-keyfile"), string(buf));
 
   memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "debug", buf, sizeof(buf));
+  ret = rados_conf_get(cl, "max_open_files", buf, sizeof(buf));
   ASSERT_EQ(ret, 0);
   ASSERT_EQ(string("2"), string(buf));