summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2017-05-20 16:06:25 +0200
committerJan Lehnardt <jan@apache.org>2017-05-20 16:07:02 +0200
commitd899ea6a29854e6e23be1d4afff986b825e938ab (patch)
tree86a7c5beed6e24332cd8f5436b55da965d5fede2
parentee9261c7699df8ebcafe9b1b2af7212d499a6b09 (diff)
downloadcouchdb-d899ea6a29854e6e23be1d4afff986b825e938ab.tar.gz
Fix merge of 27f5067c and aca6a459
-rw-r--r--src/couch_replicator/test/couch_replicator_compact_tests.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/couch_replicator/test/couch_replicator_compact_tests.erl b/src/couch_replicator/test/couch_replicator_compact_tests.erl
index c99335d3d..3c9fb090f 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),