You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/06 18:19:22 UTC
[24/26] couch-replicator commit: updated refs/heads/import-rcouch to
589d958
fix tests
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/5610fe8a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/5610fe8a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/5610fe8a
Branch: refs/heads/import-rcouch
Commit: 5610fe8a5be9bacb640cdf22c831fd7e34d574d9
Parents: 2a8500c
Author: benoitc <be...@apache.org>
Authored: Thu Jan 9 20:56:15 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 11:17:54 2014 -0600
----------------------------------------------------------------------
src/couch_replicator_sup.erl | 6 +++++-
test/03-replication-compact.t | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/5610fe8a/src/couch_replicator_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_sup.erl b/src/couch_replicator_sup.erl
index 905e2cf..7ae5367 100644
--- a/src/couch_replicator_sup.erl
+++ b/src/couch_replicator_sup.erl
@@ -17,6 +17,7 @@
%% API
-export([start_link/0]).
+-export([stop/0]).
%% Supervisor callbacks
-export([init/1]).
@@ -31,6 +32,9 @@
start_link() ->
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+stop() ->
+ catch exit(whereis(couch_replicator_sup), normal).
+
%% ===================================================================
%% Supervisor callbacks
%% ===================================================================
@@ -56,4 +60,4 @@ init([]) ->
supervisor,
[couch_replicator_manager_sup]}
],
- {ok, { {one_for_one, 10, 3600}, Children} }.
+ {ok, { {one_for_one, 100, 3600}, Children} }.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/5610fe8a/test/03-replication-compact.t
----------------------------------------------------------------------
diff --git a/test/03-replication-compact.t b/test/03-replication-compact.t
index 3e52b37..801b173 100755
--- a/test/03-replication-compact.t
+++ b/test/03-replication-compact.t
@@ -119,8 +119,11 @@ test() ->
delete_db(SourceDb),
delete_db(TargetDb),
couch_server_sup:stop(),
+ couch_replicator_sup:stop(),
+
ok = timer:sleep(1000),
- couch_server_sup:start_link(test_util:config_files())
+ couch_server_sup:start_link(test_util:config_files()),
+ couch_replicator_sup:start_link()
end,
Pairs),