summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Kocoloski <kocolosk@apache.org>2019-07-27 21:38:33 -0400
committerAdam Kocoloski <kocolosk@apache.org>2019-07-27 21:38:33 -0400
commitc5941bbf34fc8d3db7a2985914ba6747f6bed020 (patch)
treee3d5d09670400ed21ff80a175d9928e2980c154c
parent3505281559513e2922484ebf0996a8846dcc0a34 (diff)
downloadcouchdb-bump-btree-test-timeouts.tar.gz
Increase timeouts on two slow btree testsjenkins-bump-btree-test-timeoutsbump-btree-test-timeouts
These two tests are reliably timing out on ARM hardware in Jenkins. They do a lot of individual btree operations so this is not entirely surprising. Appropriate course of action here is to raise the timeout.
-rw-r--r--src/couch/test/couch_btree_tests.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/couch/test/couch_btree_tests.erl b/src/couch/test/couch_btree_tests.erl
index 3c8840a60..c9b791d2c 100644
--- a/src/couch/test/couch_btree_tests.erl
+++ b/src/couch/test/couch_btree_tests.erl
@@ -16,6 +16,7 @@
-include_lib("couch/include/couch_db.hrl").
-define(ROWS, 1000).
+-define(TIMEOUT, 60). % seconds
setup() ->
@@ -276,7 +277,9 @@ should_add_every_odd_key_remove_every_even(KeyValues, {_, Btree}) ->
false -> {Count + 1, Left, [X | Right]}
end
end, {0, [], []}, KeyValues),
- ?_assert(test_add_remove(Btree1, Rem2Keys0, Rem2Keys1)).
+ {timeout, ?TIMEOUT,
+ ?_assert(test_add_remove(Btree1, Rem2Keys0, Rem2Keys1))
+ }.
should_add_every_even_key_remove_every_old(KeyValues, {_, Btree}) ->
{ok, Btree1} = couch_btree:add_remove(Btree, KeyValues, []),
@@ -286,7 +289,9 @@ should_add_every_even_key_remove_every_old(KeyValues, {_, Btree}) ->
false -> {Count + 1, Left, [X | Right]}
end
end, {0, [], []}, KeyValues),
- ?_assert(test_add_remove(Btree1, Rem2Keys1, Rem2Keys0)).
+ {timeout, ?TIMEOUT,
+ ?_assert(test_add_remove(Btree1, Rem2Keys1, Rem2Keys0))
+ }.
should_reduce_without_specified_direction({_, Btree}) ->