From: Kefu Chai <kchai@redhat.com>
Date: Sat, 27 Jun 2020 11:35:32 +0000 (+0800)
Subject: test/objectstore: group subtests using braces
X-Git-Tag: v16.1.0~1874^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed6b5ee2224b80626ff64ef290305b5211fdbe88;p=ceph.git

test/objectstore: group subtests using braces

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc
index 7ea1e38d4c94..6e5e5e2c4f5d 100644
--- a/src/test/objectstore/test_kv.cc
+++ b/src/test/objectstore/test_kv.cc
@@ -1242,22 +1242,35 @@ TEST_F(RocksDBResharding, change_reshard) {
   data_to_db();
   check_db();
   db->close();
-  RocksDBStore::resharding_ctrl ctrl;
-  ctrl.unittest_fail_after_first_batch = true;
-  ASSERT_EQ(db->reshard("C(5) D(3)", &ctrl), -1000);
-  ASSERT_NE(db->open(cout), 0);
-  ctrl.unittest_fail_after_first_batch = false;
-  ctrl.unittest_fail_after_processing_column = true;
-  ASSERT_EQ(db->reshard("C(5) Evade(2)", &ctrl), -1001);
-  ASSERT_NE(db->open(cout), 0);
-  ctrl.unittest_fail_after_processing_column = false;
-  ctrl.unittest_fail_after_successful_processing = true;
-  ASSERT_EQ(db->reshard("Evade(2) D(3)", &ctrl), -1002);
-  ASSERT_NE(db->open(cout), 0);
-  ASSERT_EQ(db->reshard("Ad(1) Evade(5)"), 0);
-  ASSERT_EQ(db->open(cout), 0);
-  check_db();
-  db->close();
+  {
+    RocksDBStore::resharding_ctrl ctrl;
+    ctrl.unittest_fail_after_first_batch = true;
+    ASSERT_EQ(db->reshard("C(5) D(3)", &ctrl), -1000);
+  }
+  {
+    RocksDBStore::resharding_ctrl ctrl;
+    ASSERT_NE(db->open(cout), 0);
+    ctrl.unittest_fail_after_first_batch = false;
+    ctrl.unittest_fail_after_processing_column = true;
+    ASSERT_EQ(db->reshard("C(5) Evade(2)", &ctrl), -1001);
+  }
+  {
+    RocksDBStore::resharding_ctrl ctrl;
+    ASSERT_NE(db->open(cout), 0);
+    ctrl.unittest_fail_after_processing_column = false;
+    ctrl.unittest_fail_after_successful_processing = true;
+    ASSERT_EQ(db->reshard("Evade(2) D(3)", &ctrl), -1002);
+  }
+  {
+    RocksDBStore::resharding_ctrl ctrl;
+    ASSERT_NE(db->open(cout), 0);
+    ASSERT_EQ(db->reshard("Ad(1) Evade(5)"), 0);
+  }
+  {
+    ASSERT_EQ(db->open(cout), 0);
+    check_db();
+    db->close();
+  }
 }