test/store_test: Add double check for repair

Add fsck after repair to verify.
Also drop some unnecesary calls to mount().

Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit 3c2574c3aa19453ebf488d2fb4c014d639637384)

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 556b00b920d8b30961eff1ec33937516cf57128a..f1bd146eaeae6911ec1f1afd145838bc37bbbadc 100644 (file)
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -10398,7 +10398,6 @@ TEST_P(MultiLabelTest, MultiSelectableOff) {
   int r = read_bdev_label(&label, 0);
   ASSERT_EQ(r, 0);
   ASSERT_EQ(label.meta.end(), label.meta.find("multi"));
-  mount();
 }
 
 TEST_P(MultiLabelTest, MultiSelectableOn) {
@@ -10415,7 +10414,6 @@ TEST_P(MultiLabelTest, MultiSelectableOn) {
   auto it = label.meta.find("multi");
   ASSERT_NE(label.meta.end(), it);
   ASSERT_EQ(it->second, "yes");
-  mount();
 }
 
 TEST_P(MultiLabelTest, DetectCorruptedFirst) {
@@ -10447,7 +10445,7 @@ TEST_P(MultiLabelTest, FixCorruptedFirst) {
   ASSERT_EQ(corrupt, true);
   ASSERT_EQ(store->fsck(false), 1);
   ASSERT_EQ(store->repair(false), 0);
-  mount();
+  ASSERT_EQ(store->fsck(false), 0);
 }
 
 TEST_P(MultiLabelTest, FixCorruptedTwo) {
@@ -10467,7 +10465,7 @@ TEST_P(MultiLabelTest, FixCorruptedTwo) {
   ASSERT_EQ(corrupt, true);
   ASSERT_EQ(store->fsck(false), 2);
   ASSERT_EQ(store->repair(false), 0);
-  mount();
+  ASSERT_EQ(store->fsck(false), 0);
 }
 
 TEST_P(MultiLabelTest, FixCorruptedThree) {
@@ -10489,7 +10487,7 @@ TEST_P(MultiLabelTest, FixCorruptedThree) {
   ASSERT_EQ(corrupt, true);
   ASSERT_EQ(store->fsck(false), 3);
   ASSERT_EQ(store->repair(false), 0);
-  mount();
+  ASSERT_EQ(store->fsck(false), 0);
 }
 
 TEST_P(MultiLabelTest, CantFixCorruptedAll) {
@@ -10513,6 +10511,7 @@ TEST_P(MultiLabelTest, CantFixCorruptedAll) {
   ASSERT_EQ(corrupt, true);
   ASSERT_NE(store->fsck(false), 0);
   ASSERT_NE(store->repair(false), 0);
+  ASSERT_NE(store->fsck(false), 0);
 }
 
 TEST_P(MultiLabelTest, SkipInvalidUUID) {
@@ -10539,6 +10538,7 @@ TEST_P(MultiLabelTest, SkipInvalidUUID) {
 
   ASSERT_EQ(store->fsck(false), 1);
   ASSERT_EQ(store->repair(false), 0);
+  ASSERT_EQ(store->fsck(false), 0);
   mount();
 }