]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
test/objectstore: group subtests using braces
authorKefu Chai <kchai@redhat.com>
Sat, 27 Jun 2020 11:35:32 +0000 (19:35 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 27 Jun 2020 14:48:48 +0000 (22:48 +0800)
for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/test/objectstore/test_kv.cc

index 7ea1e38d4c94b7f6b2185b38e1a5d3092857b6fb..6e5e5e2c4f5d22f2762f70cbe651e50f35b79b9a 100644 (file)
@@ -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();
+  }
 }