From afac9345fd54e9ff69bdeefe4557d8235c4e3960 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 22 Sep 2016 13:46:54 +0800 Subject: [PATCH] ceph_test_objectstore: fail the test if SetUp() fails so it will issues a fatal error if anything goes wrong, instead of continuing with the test cases. Signed-off-by: Kefu Chai --- src/test/objectstore/store_test_fixture.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/objectstore/store_test_fixture.cc b/src/test/objectstore/store_test_fixture.cc index 7f2069ada15..66bd37c6a04 100644 --- a/src/test/objectstore/store_test_fixture.cc +++ b/src/test/objectstore/store_test_fixture.cc @@ -22,8 +22,8 @@ void StoreTestFixture::SetUp() { if (r < 0) { r = -errno; cerr << __func__ << ": unable to create " << data_dir << ": " << cpp_strerror(r) << std::endl; - return; } + ASSERT_EQ(0, r); store.reset(ObjectStore::create(g_ceph_context, type, @@ -31,10 +31,10 @@ void StoreTestFixture::SetUp() { string("store_test_temp_journal"))); if (!store) { cerr << __func__ << ": objectstore type " << type << " doesn't exist yet!" << std::endl; - return; } - EXPECT_EQ(0, store->mkfs()); - EXPECT_EQ(0, store->mount()); + ASSERT_TRUE(store); + ASSERT_EQ(0, store->mkfs()); + ASSERT_EQ(0, store->mount()); } void StoreTestFixture::TearDown() {