couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fdman...@apache.org
Subject git commit: Small tweaks to test 242-replication-many-leaves.t
Date Mon, 23 Jan 2012 16:43:17 GMT
Updated Branches:
  refs/heads/master 50ae62f71 -> 84366a5aa


Small tweaks to test 242-replication-many-leaves.t

These tweaks make the test pass on slower machines/environments.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/84366a5a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/84366a5a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/84366a5a

Branch: refs/heads/master
Commit: 84366a5aa2141a7c082f9135401b48647c62acaa
Parents: 50ae62f
Author: Filipe David Borba Manana <fdmanana@apache.org>
Authored: Mon Jan 23 16:40:30 2012 +0000
Committer: Filipe David Borba Manana <fdmanana@apache.org>
Committed: Mon Jan 23 16:42:19 2012 +0000

----------------------------------------------------------------------
 .../test/05-replication-many-leaves.t              |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/84366a5a/src/couch_replicator/test/05-replication-many-leaves.t
----------------------------------------------------------------------
diff --git a/src/couch_replicator/test/05-replication-many-leaves.t b/src/couch_replicator/test/05-replication-many-leaves.t
index d8d3eb9..212ee99 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.


Mime
View raw message