Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix two nondeterministically failing cache tests. (#9101)

This commit is contained in:
Dan Larkin-York 2019-05-27 05:44:59 -04:00 committed by Jan
parent c23c50c069
commit c3f03bc27d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Cache/PlainCache.cpp
View File

@ -171,7 +171,6 @@ TEST(CachePlainCacheTest, test_that_removal_works_as_expected) {
} }
TEST(CachePlainCacheTest, verify_that_cache_can_indeed_grow_when_it_runs_out_of_space_LongRunning) { TEST(CachePlainCacheTest, verify_that_cache_can_indeed_grow_when_it_runs_out_of_space_LongRunning) {
uint64_t minimumUsage = 1024 * 1024;
MockScheduler scheduler(4); MockScheduler scheduler(4);
auto postFn = [&scheduler](std::function<void()> fn) -> bool { auto postFn = [&scheduler](std::function<void()> fn) -> bool {
scheduler.post(fn); scheduler.post(fn);
@ -179,6 +178,7 @@ TEST(CachePlainCacheTest, verify_that_cache_can_indeed_grow_when_it_runs_out_of_
}; };
Manager manager(postFn, 1024 * 1024 * 1024); Manager manager(postFn, 1024 * 1024 * 1024);
auto cache = manager.createCache(CacheType::Plain); auto cache = manager.createCache(CacheType::Plain);
uint64_t minimumUsage = cache->usageLimit() * 2;
for (uint64_t i = 0; i < 4 * 1024 * 1024; i++) { for (uint64_t i = 0; i < 4 * 1024 * 1024; i++) {
CachedValue* value = CachedValue* value =
@ -190,7 +190,8 @@ TEST(CachePlainCacheTest, verify_that_cache_can_indeed_grow_when_it_runs_out_of_
} }
} }
EXPECT_TRUE(cache->usage() > minimumUsage); EXPECT_GT(cache->usageLimit(), minimumUsage);
EXPECT_GT(cache->usage(), minimumUsage);
manager.destroyCache(cache); manager.destroyCache(cache);
} }

5
tests/Cache/TransactionalCache.cpp
View File

@ -234,7 +234,6 @@ TEST(CacheTransactionalCacheTest, verify_blacklisting_works_as_expected) {
} }
TEST(CacheTransactionalCacheTest, verify_cache_can_grow_correctly_when_it_runs_out_of_space_LongRunning) { TEST(CacheTransactionalCacheTest, verify_cache_can_grow_correctly_when_it_runs_out_of_space_LongRunning) {
uint64_t minimumUsage = 1024 * 1024;
MockScheduler scheduler(4); MockScheduler scheduler(4);
auto postFn = [&scheduler](std::function<void()> fn) -> bool { auto postFn = [&scheduler](std::function<void()> fn) -> bool {
scheduler.post(fn); scheduler.post(fn);
@ -242,6 +241,7 @@ TEST(CacheTransactionalCacheTest, verify_cache_can_grow_correctly_when_it_runs_o
}; };
Manager manager(postFn, 1024 * 1024 * 1024); Manager manager(postFn, 1024 * 1024 * 1024);
auto cache = manager.createCache(CacheType::Transactional); auto cache = manager.createCache(CacheType::Transactional);
uint64_t minimumUsage = cache->usageLimit() * 2;
for (uint64_t i = 0; i < 4 * 1024 * 1024; i++) { for (uint64_t i = 0; i < 4 * 1024 * 1024; i++) {
CachedValue* value = CachedValue* value =
@ -253,7 +253,8 @@ TEST(CacheTransactionalCacheTest, verify_cache_can_grow_correctly_when_it_runs_o
} }
} }
ASSERT_TRUE(cache->usage() > minimumUsage); EXPECT_GT(cache->usageLimit(), minimumUsage);
EXPECT_GT(cache->usage(), minimumUsage);
manager.destroyCache(cache); manager.destroyCache(cache);
} }