diff options
| author | Geir Storli <geirst@vespa.ai> | 2024-03-11 10:50:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-11 10:50:06 +0100 |
| commit | 0d190d45c755a2db0d59e9f43e48339f453f99df (patch) | |
| tree | 0761ffc22b2194dbcf3ed91f0f8c6877f54de6c9 | |
| parent | 7604ddee214dd0cd3c103d0483a349e093611c52 (diff) | |
| parent | 2700aca1661b6792757b404113d14f60a8dd3248 (diff) | |
Merge pull request #30548 from vespa-engine/toregge/early-exit-on-fatal-error-in-frozen-btree-unit-test
Early exit on fatal error in frozen btree unit test.
| -rw-r--r-- | vespalib/src/tests/btree/frozenbtree_test.cpp | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/vespalib/src/tests/btree/frozenbtree_test.cpp b/vespalib/src/tests/btree/frozenbtree_test.cpp index ffe8b4516aa..bc8230e2ded 100644 --- a/vespalib/src/tests/btree/frozenbtree_test.cpp +++ b/vespalib/src/tests/btree/frozenbtree_test.cpp @@ -416,37 +416,22 @@ TEST_F(FrozenBTreeTest, test_frozen_btree) sortRandomValues(); allocTree(); - insertRandomValues(*_tree, *_allocator, _randomValues); - lookupRandomValues(*_tree, *_allocator, _randomValues); + ASSERT_NO_FATAL_FAILURE(insertRandomValues(*_tree, *_allocator, _randomValues)); + ASSERT_NO_FATAL_FAILURE(lookupRandomValues(*_tree, *_allocator, _randomValues)); EXPECT_TRUE(_tree->getFrozenView(*_allocator).empty()); _allocator->freeze(); EXPECT_FALSE(_tree->getFrozenView(*_allocator).empty()); _allocator->assign_generation(_generationHandler->getCurrentGeneration()); lookupFrozenRandomValues(*_tree, *_allocator, _randomValues); - traverseTreeIterator(*_tree, - *_allocator, - _sortedRandomValues, - false); - traverseTreeIterator(*_tree, - *_allocator, - _sortedRandomValues, - true); - traverseTreeIterator(*_tree, - *_allocator, - _sortedRandomValues, - false); - traverseTreeIterator(*_tree, - *_allocator, - _sortedRandomValues, - true); - removeRandomValues(*_tree, *_allocator, _randomValues); - lookupGoneRandomValues(*_tree, *_allocator, _randomValues); - lookupFrozenRandomValues(*_tree, *_allocator,_randomValues); - traverseTreeIterator(*_tree, - *_allocator, - _sortedRandomValues, - true); - insertRandomValues(*_tree, *_allocator, _randomValues); + ASSERT_NO_FATAL_FAILURE(traverseTreeIterator(*_tree, *_allocator, _sortedRandomValues, false)); + ASSERT_NO_FATAL_FAILURE(traverseTreeIterator(*_tree, *_allocator, _sortedRandomValues, true)); + ASSERT_NO_FATAL_FAILURE(traverseTreeIterator(*_tree, *_allocator, _sortedRandomValues, false)); + ASSERT_NO_FATAL_FAILURE(traverseTreeIterator(*_tree, *_allocator, _sortedRandomValues, true)); + ASSERT_NO_FATAL_FAILURE(removeRandomValues(*_tree, *_allocator, _randomValues)); + ASSERT_NO_FATAL_FAILURE(lookupGoneRandomValues(*_tree, *_allocator, _randomValues)); + ASSERT_NO_FATAL_FAILURE(lookupFrozenRandomValues(*_tree, *_allocator,_randomValues)); + ASSERT_NO_FATAL_FAILURE(traverseTreeIterator(*_tree, *_allocator, _sortedRandomValues, true)); + ASSERT_NO_FATAL_FAILURE(insertRandomValues(*_tree, *_allocator, _randomValues)); freeTree(true); } |