From: Sage Weil <sage@redhat.com>
Date: Wed, 23 Dec 2015 22:55:22 +0000 (-0500)
Subject: ceph_test_objectstore: clean out test dir for each test
X-Git-Tag: v10.0.3~154^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5950eae87b7bda588b8e5f84d03e5b06475c57b7;p=ceph.git

ceph_test_objectstore: clean out test dir for each test

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

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 598b444e6fde..100e1c4ef1f1 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -42,9 +42,20 @@ public:
   boost::scoped_ptr<ObjectStore> store;
 
   StoreTest() : store(0) {}
+
+  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;
+    }
+  }
+
   virtual void SetUp() {
     int r = ::mkdir("store_test_temp_dir", 0777);
-    if (r < 0 && errno != EEXIST) {
+    if (r < 0) {
       r = -errno;
       cerr << __func__ << ": unable to create store_test_temp_dir" << ": " << cpp_strerror(r) << std::endl;
       return;
@@ -64,8 +75,10 @@ public:
   }
 
   virtual void TearDown() {
-    if (store)
+    if (store) {
       store->umount();
+      rm_r("store_test_temp_dir");
+    }
   }
 };