From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Apr 2016 20:38:14 +0000 (-0400)
Subject: ceph_test_keyvaluedb: clean up test dir
X-Git-Tag: v10.2.1~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9051%2Fhead;p=ceph.git

ceph_test_keyvaluedb: clean up test dir

Just like ceph_test_objectstore

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2b075aa52d4475338c0f3cd3360e1ee4de8befa7)
---

diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc
index 32eccb8389b8..06c45e0cb7e1 100644
--- a/src/test/objectstore/test_kv.cc
+++ b/src/test/objectstore/test_kv.cc
@@ -35,29 +35,38 @@ public:
 
   KVTest() : db(0) {}
 
-  string mydirname() { return "kv_test_temp_dir_" + string(GetParam()); }
+  void rm_r(string path) {
+    string cmd = string("rm -r ") + path;
+    cout << "==> " << cmd << std::endl;
+    int r = ::system(cmd.c_str());
+    if (r) {
+      cerr << "failed with exit code " << r
+	   << ", continuing anyway" << std::endl;
+    }
+  }
 
   void init() {
     cout << "Creating " << string(GetParam()) << "\n";
     db.reset(KeyValueDB::create(g_ceph_context, string(GetParam()),
-				mydirname()));
+				"kv_test_temp_dir"));
   }
   void fini() {
     db.reset(NULL);
   }
 
   virtual void SetUp() {
-    int r = ::mkdir(mydirname().c_str(), 0777);
+    int r = ::mkdir("kv_test_temp_dir", 0777);
     if (r < 0 && errno != EEXIST) {
       r = -errno;
-      cerr << __func__ << ": unable to create " << mydirname()
-	   << ": " << cpp_strerror(r) << std::endl;
+      cerr << __func__ << ": unable to create kv_test_temp_dir: "
+	   << cpp_strerror(r) << std::endl;
       return;
     }
     init();
   }
   virtual void TearDown() {
     fini();
+    rm_r("kv_test_temp_dir");
   }
 };