From 05c168658e60d9748fe873f316a2c0e076d6dd7b Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Mon, 21 Apr 2014 12:55:41 -0700 Subject: [PATCH] Relax env_test::AllocateTest --- util/env_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/env_test.cc b/util/env_test.cc index 6ccfc90013..e6de69fafd 100644 --- a/util/env_test.cc +++ b/util/env_test.cc @@ -306,7 +306,8 @@ TEST(EnvPosixTest, AllocateTest) { // we only require that number of allocated blocks is at least what we expect. // It looks like some FS give us more blocks that we asked for. That's fine. // It might be worth investigating further. - ASSERT_LE((unsigned int)(kPreallocateSize / kBlockSize), f_stat.st_blocks); + auto st_blocks = f_stat.st_blocks; + ASSERT_LE((unsigned int)(kPreallocateSize / kBlockSize), st_blocks); // close the file, should deallocate the blocks wfile.reset(); @@ -314,8 +315,7 @@ TEST(EnvPosixTest, AllocateTest) { stat(fname.c_str(), &f_stat); ASSERT_EQ((unsigned int)data.size(), f_stat.st_size); // verify that preallocated blocks were deallocated on file close - size_t data_blocks_pages = ((data.size() + kPageSize - 1) / kPageSize); - ASSERT_EQ((unsigned int)(data_blocks_pages * kPageSize / kBlockSize), f_stat.st_blocks); + ASSERT_GT(st_blocks, f_stat.st_blocks); } #endif