couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [1/2] couch-replicator commit: updated refs/heads/master to 1979506
Date Fri, 11 Mar 2016 21:05:35 GMT
Repository: couchdb-couch-replicator
Updated Branches:
  refs/heads/master 2363748ba -> 197950631


Fix flaky replicator tests.

Replication+compaction test periodically times out
when running under CI. Adjust writer timeout from 3 to 9 sec.

Also clean up confusing / unused TIMEOUT_STOP constant.


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

Branch: refs/heads/master
Commit: b26c6f0ea6e7568a1d51890ffead941c4ca9cced
Parents: 2363748
Author: Nick Vatamaniuc <vatamane@gmail.com>
Authored: Wed Mar 9 15:05:46 2016 -0500
Committer: Nick Vatamaniuc <vatamane@gmail.com>
Committed: Wed Mar 9 15:05:46 2016 -0500

----------------------------------------------------------------------
 test/couch_replicator_compact_tests.erl         | 3 +--
 test/couch_replicator_large_atts_tests.erl      | 1 -
 test/couch_replicator_many_leaves_tests.erl     | 1 -
 test/couch_replicator_missing_stubs_tests.erl   | 1 -
 test/couch_replicator_use_checkpoints_tests.erl | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/b26c6f0e/test/couch_replicator_compact_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_compact_tests.erl b/test/couch_replicator_compact_tests.erl
index 76e7ecd..7a5a25a 100644
--- a/test/couch_replicator_compact_tests.erl
+++ b/test/couch_replicator_compact_tests.erl
@@ -19,8 +19,7 @@
 -define(ATTFILE, filename:join([?FIXTURESDIR, "logo.png"])).
 -define(DELAY, 100).
 -define(TIMEOUT, 30000).
--define(TIMEOUT_STOP, 1000).
--define(TIMEOUT_WRITER, 3000).
+-define(TIMEOUT_WRITER, 9000).
 -define(TIMEOUT_EUNIT, ?TIMEOUT div 1000 + 70).
 
 setup() ->

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/b26c6f0e/test/couch_replicator_large_atts_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_large_atts_tests.erl b/test/couch_replicator_large_atts_tests.erl
index 67f4d75..79e44b2 100644
--- a/test/couch_replicator_large_atts_tests.erl
+++ b/test/couch_replicator_large_atts_tests.erl
@@ -25,7 +25,6 @@
 -define(ATT_SIZE_2, round(6.6 * 1024 * 1024)).
 -define(DOCS_COUNT, 11).
 -define(TIMEOUT_EUNIT, 30).
--define(TIMEOUT_STOP, 1000).
 
 
 setup() ->

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/b26c6f0e/test/couch_replicator_many_leaves_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_many_leaves_tests.erl b/test/couch_replicator_many_leaves_tests.erl
index 40ca611..bde0e2c 100644
--- a/test/couch_replicator_many_leaves_tests.erl
+++ b/test/couch_replicator_many_leaves_tests.erl
@@ -22,7 +22,6 @@
     {<<"doc3">>, 210}
 ]).
 -define(NUM_ATTS, 2).
--define(TIMEOUT_STOP, 1000).
 -define(TIMEOUT_EUNIT, 60).
 -define(i2l(I), integer_to_list(I)).
 -define(io2b(Io), iolist_to_binary(Io)).

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/b26c6f0e/test/couch_replicator_missing_stubs_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_missing_stubs_tests.erl b/test/couch_replicator_missing_stubs_tests.erl
index 034ca42..e8ccd64 100644
--- a/test/couch_replicator_missing_stubs_tests.erl
+++ b/test/couch_replicator_missing_stubs_tests.erl
@@ -22,7 +22,6 @@
 ]).
 
 -define(REVS_LIMIT, 3).
--define(TIMEOUT_STOP, 1000).
 -define(TIMEOUT_EUNIT, 30).
 
 setup() ->

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/b26c6f0e/test/couch_replicator_use_checkpoints_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_replicator_use_checkpoints_tests.erl b/test/couch_replicator_use_checkpoints_tests.erl
index 7b7a55a..e04488e 100644
--- a/test/couch_replicator_use_checkpoints_tests.erl
+++ b/test/couch_replicator_use_checkpoints_tests.erl
@@ -16,7 +16,6 @@
 -include_lib("couch/include/couch_db.hrl").
 
 -define(DOCS_COUNT, 100).
--define(TIMEOUT_STOP, 1000).
 -define(TIMEOUT_EUNIT, 30).
 -define(i2l(I), integer_to_list(I)).
 -define(io2b(Io), iolist_to_binary(Io)).


Mime
View raw message