couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [couchdb] branch 2.1.x updated: backport 27f5067c853f9cb8d124328e7844b27d04630d94 from master
Date Sat, 20 May 2017 14:06:32 GMT
This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch 2.1.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git

The following commit(s) were added to refs/heads/2.1.x by this push:
       new  d3aff2d   backport 27f5067c853f9cb8d124328e7844b27d04630d94 from master
d3aff2d is described below

commit d3aff2df03f6592d49fc2d0aa44ee4cc364c556d
Author: Jan Lehnardt <jan@apache.org>
AuthorDate: Sat May 20 16:06:25 2017 +0200

    backport 27f5067c853f9cb8d124328e7844b27d04630d94 from master
---
 src/couch_replicator/test/couch_replicator_compact_tests.erl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/couch_replicator/test/couch_replicator_compact_tests.erl b/src/couch_replicator/test/couch_replicator_compact_tests.erl
index 495075d..dbb63bc 100644
--- a/src/couch_replicator/test/couch_replicator_compact_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_compact_tests.erl
@@ -92,7 +92,7 @@ should_run_replication(RepPid, RepId, Source, Target) ->
 should_ensure_replication_still_running(RepPid, RepId, Source, Target) ->
     ?_test(check_active_tasks(RepPid, RepId, Source, Target)).
 
-check_active_tasks(RepPid, {BaseId, Ext} = _RepId, Src, Tgt) ->
+check_active_tasks(RepPid, {BaseId, Ext} = RepId, Src, Tgt) ->
     Source = case Src of
         {remote, NameSrc} ->
             <<(db_url(NameSrc))/binary, $/>>;
@@ -135,7 +135,7 @@ wait_for_replicator(Pid) ->
 
 wait_for_task_status() ->
     test_util:wait(fun() ->
-        case couch_task_status:all() of
+        case replication_tasks() of
             [] ->
                 wait;
             Tasks ->
@@ -143,6 +143,11 @@ wait_for_task_status() ->
         end
     end).
 
+replication_tasks() ->
+    lists:filter(fun(P) ->
+        couch_util:get_value(type, P) =:= replication
+    end, couch_task_status:all()).
+
 should_cancel_replication(RepId, RepPid) ->
     ?_assertNot(begin
         {ok, _} = couch_replicator:cancel_replication(RepId),

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <commits@couchdb.apache.org>'].

Mime
View raw message