From: Igor Fedotov <ifedotov@suse.com>
Date: Mon, 28 Dec 2020 20:23:48 +0000 (+0300)
Subject: test/store_text_fixture: do umount before restoring default config.
X-Git-Tag: v17.1.0~115^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1908cfcd82fbb9ab99c0bce9b7bb8ab81f40e270;p=ceph-ci.git

test/store_text_fixture: do umount before restoring default config.

Hence umount can benefit from custom settings as well.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
---

diff --git a/src/test/objectstore/store_test_fixture.cc b/src/test/objectstore/store_test_fixture.cc
index 130c2c78bb9..a3bdc7a36ac 100644
--- a/src/test/objectstore/store_test_fixture.cc
+++ b/src/test/objectstore/store_test_fixture.cc
@@ -68,6 +68,11 @@ void StoreTestFixture::SetUp()
 
 void StoreTestFixture::TearDown()
 {
+  if (store) {
+    int r = store->umount();
+    EXPECT_EQ(0, r);
+    rm_r(data_dir);
+  }
   // we keep this stuff 'unsafe' out of test case scope to be able to update ANY
   // config settings. Hence setting it to 'unsafe' here as test case is closing.
   g_conf()._clear_safe_to_start_threads();
@@ -76,11 +81,6 @@ void StoreTestFixture::TearDown()
     ::testing::FLAGS_gtest_death_test_style = orig_death_test_style;
     orig_death_test_style.clear();
   }
-  if (store) {
-    int r = store->umount();
-    EXPECT_EQ(0, r);
-    rm_r(data_dir);
-  }
 }
 
 void StoreTestFixture::SetVal(ConfigProxy& _conf, const char* key, const char* val)