From: Haomai Wang <haomaiwang@gmail.com>
Date: Fri, 10 Apr 2015 08:51:31 +0000 (+0800)
Subject: librbd: Fix image_watcher test
X-Git-Tag: v9.0.1~147^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f1259cdf060bfe44032148ecc3c41e793d13b32;p=ceph.git

librbd: Fix image_watcher test

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/test/librbd/test_ImageWatcher.cc b/src/test/librbd/test_ImageWatcher.cc
index ed514946c82a..e59d47a63ff2 100644
--- a/src/test/librbd/test_ImageWatcher.cc
+++ b/src/test/librbd/test_ImageWatcher.cc
@@ -903,14 +903,7 @@ TEST_F(TestImageWatcher, NotifyAsyncRequestTimedOut) {
   librbd::ImageCtx *ictx;
   ASSERT_EQ(0, open_image(m_image_name, &ictx));
 
-  md_config_t *conf = ictx->cct->_conf;
-  int timed_out_seconds = conf->rbd_request_timed_out_seconds;
-  conf->set_val("rbd_request_timed_out_seconds", "0");
-  BOOST_SCOPE_EXIT( (timed_out_seconds)(conf) ) {
-    conf->set_val("rbd_request_timed_out_seconds",
-                  stringify(timed_out_seconds).c_str());
-  } BOOST_SCOPE_EXIT_END;
-  ASSERT_EQ(0, conf->rbd_request_timed_out_seconds);
+  ictx->request_timed_out_seconds = 0;
 
   ASSERT_EQ(0, register_image_watch(*ictx));
   ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,