couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject [31/50] couch commit: updated refs/heads/2971-count-distinct to ee32cd5
Date Wed, 01 Mar 2017 16:39:18 GMT
Fix couchdb_views tests

Previous commit made couch_file to monitor db_pid
instead of linking ot it, so number of monitored_by
for couch_db process, checked in couchdb_views_tests,
changed.

COUCHDB-3259


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/2994cded
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/2994cded
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/2994cded

Branch: refs/heads/2971-count-distinct
Commit: 2994cded4968fa3fbf9f6178c224f3b1f62f3ea5
Parents: bbc32e1
Author: Eric Avdey <eiri@eiri.ca>
Authored: Thu Jan 5 17:30:00 2017 -0400
Committer: Eric Avdey <eiri@eiri.ca>
Committed: Thu Jan 5 21:41:55 2017 -0400

----------------------------------------------------------------------
 test/couchdb_views_tests.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/2994cded/test/couchdb_views_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_views_tests.erl b/test/couchdb_views_tests.erl
index 289ecb8..7b04e85 100644
--- a/test/couchdb_views_tests.erl
+++ b/test/couchdb_views_tests.erl
@@ -529,8 +529,9 @@ view_cleanup(DbName) ->
 count_users(DbName) ->
     {ok, Db} = couch_db:open_int(DbName, [?ADMIN_CTX]),
     {monitored_by, Monitors} = erlang:process_info(Db#db.main_pid, monitored_by),
+    CouchFiles = [P || P <- Monitors, couch_file:process_info(P) =/= undefined],
     ok = couch_db:close(Db),
-    length(lists:usort(Monitors) -- [self()]).
+    length(lists:usort(Monitors) -- [self() | CouchFiles]).
 
 count_index_files(DbName) ->
     % call server to fetch the index files


Mime
View raw message