couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [05/12] couch-replicator commit: updated refs/heads/1994-merge-rcouch to c8f517d
Date Thu, 13 Feb 2014 00:18:47 GMT
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/600dc4af
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/600dc4af
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/600dc4af

Branch: refs/heads/1994-merge-rcouch
Commit: 600dc4af37c9d3b61fb12fb1f7482a98498531c0
Parents: 7da1d78
Author: benoitc <benoitc@apache.org>
Authored: Thu Jan 9 20:56:15 2014 +0100
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Wed Feb 12 18:16:58 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/600dc4af/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/600dc4af/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),
 


Mime
View raw message