From a35be4bf28ebd6b9f1e81631de7dae730977fb2a Mon Sep 17 00:00:00 2001 From: "Andrew J. Stone" Date: Mon, 2 Jun 2014 16:40:19 -0400 Subject: [PATCH] increase timeouts for SC operations in ensemble tests --- tests/ensemble_sync.erl | 2 +- tests/ensemble_util.erl | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/ensemble_sync.erl b/tests/ensemble_sync.erl index 39da478c..e071a23f 100644 --- a/tests/ensemble_sync.erl +++ b/tests/ensemble_sync.erl @@ -71,7 +71,7 @@ run_scenario(Nodes, NVal, {NumKill, NumSuspend, NumValid, _, Name, Expect}) -> io:format("PL: ~p~n", [PL]), PBC = rt:pbc(Node), - Options = [{timeout, 500}], + Options = [{timeout, 2000}], rpc:multicall(Nodes, riak_kv_entropy_manager, set_mode, [manual]), Part = rt:partition(Nodes -- Partitioned, Partitioned), diff --git a/tests/ensemble_util.erl b/tests/ensemble_util.erl index 574d89ab..42013452 100644 --- a/tests/ensemble_util.erl +++ b/tests/ensemble_util.erl @@ -95,7 +95,8 @@ wait_until_stable(Node, Count) -> wait_until_quorum(Node, Ensemble) -> F = fun() -> - case rpc:call(Node, riak_ensemble_manager, check_quorum, [Ensemble, 500]) of + case rpc:call(Node, riak_ensemble_manager, check_quorum, + [Ensemble, 10000]) of true -> true; false -> @@ -107,7 +108,8 @@ wait_until_quorum(Node, Ensemble) -> wait_until_quorum_count(Node, Ensemble, Want) -> F = fun() -> - case rpc:call(Node, riak_ensemble_manager, count_quorum, [Ensemble, 1500]) of + case rpc:call(Node, riak_ensemble_manager, count_quorum, + [Ensemble, 10000]) of Count when Count >= Want -> true; Count ->