couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [couchdb] branch master updated: Fix merge of 27f5067c and aca6a459
Date Sat, 20 May 2017 14:07:46 GMT
This is an automated email from the ASF dual-hosted git repository.

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

The following commit(s) were added to refs/heads/master by this push:
       new  d899ea6   Fix merge of 27f5067c and aca6a459
d899ea6 is described below

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

    Fix merge of 27f5067c and aca6a459
---
 src/couch_replicator/test/couch_replicator_compact_tests.erl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/couch_replicator/test/couch_replicator_compact_tests.erl b/src/couch_replicator/test/couch_replicator_compact_tests.erl
index c99335d..3c9fb09 100644
--- a/src/couch_replicator/test/couch_replicator_compact_tests.erl
+++ b/src/couch_replicator/test/couch_replicator_compact_tests.erl
@@ -148,7 +148,7 @@ wait_for_replicator(RepId) ->
 
 wait_for_task_status() ->
     test_util:wait(fun() ->
-        case couch_task_status:all() of
+        case replication_tasks() of
             [] ->
                 wait;
             Tasks ->
@@ -156,6 +156,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_scheduler:remove_job(RepId),

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

Mime
View raw message