summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@apache.org>2012-01-23 16:40:30 +0000
committerFilipe David Borba Manana <fdmanana@apache.org>2012-01-23 16:42:19 +0000
commit84366a5aa2141a7c082f9135401b48647c62acaa (patch)
tree9ad8e2f46416ff4d90a0c6d1a74401e773a6dfa2
parent50ae62f712ec1661031ec9d39ff30c914fdcdd4c (diff)
downloadcouchdb-84366a5aa2141a7c082f9135401b48647c62acaa.tar.gz
Small tweaks to test 242-replication-many-leaves.t
These tweaks make the test pass on slower machines/environments.
-rwxr-xr-xsrc/couch_replicator/test/05-replication-many-leaves.t6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/couch_replicator/test/05-replication-many-leaves.t b/src/couch_replicator/test/05-replication-many-leaves.t
index d8d3eb971..212ee9924 100755
--- a/src/couch_replicator/test/05-replication-many-leaves.t
+++ b/src/couch_replicator/test/05-replication-many-leaves.t
@@ -56,7 +56,8 @@ doc_ids() ->
doc_num_conflicts(<<"doc1">>) -> 10;
doc_num_conflicts(<<"doc2">>) -> 100;
-doc_num_conflicts(<<"doc3">>) -> 286.
+% a number > MaxURLlength (7000) / length(DocRevisionString)
+doc_num_conflicts(<<"doc3">>) -> 210.
main(_) ->
@@ -77,6 +78,7 @@ test() ->
couch_server_sup:start_link(test_util:config_files()),
ibrowse:start(),
crypto:start(),
+ couch_config:set("replicator", "connection_timeout", "90000", false),
Pairs = [
{source_db_name(), target_db_name()},
@@ -287,6 +289,6 @@ replicate(Source, Target) ->
receive
{'DOWN', MonRef, process, Pid, Reason} ->
etap:is(Reason, normal, "Replication finished successfully")
- after 300000 ->
+ after 900000 ->
etap:bail("Timeout waiting for replication to finish")
end.