You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2017/03/23 19:57:36 UTC
couch commit: updated refs/heads/master to 21c8d37
Repository: couchdb-couch
Updated Branches:
refs/heads/master f09e32101 -> 21c8d37ac
Remove PSE references from compaction test
I accidentally included part of the PSE work when I extracted this
patch. Should just be the minor tweak to access the updater pid
directly.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/21c8d37a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/21c8d37a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/21c8d37a
Branch: refs/heads/master
Commit: 21c8d37ac6ee1a7fed1de1f54f95a4d3cd9f5248
Parents: f09e321
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Mar 23 14:55:48 2017 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Mar 23 14:55:48 2017 -0500
----------------------------------------------------------------------
test/couchdb_compaction_daemon_tests.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/21c8d37a/test/couchdb_compaction_daemon_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_compaction_daemon_tests.erl b/test/couchdb_compaction_daemon_tests.erl
index 20879a7..25d9b13 100644
--- a/test/couchdb_compaction_daemon_tests.erl
+++ b/test/couchdb_compaction_daemon_tests.erl
@@ -220,7 +220,7 @@ spawn_compaction_monitor(DbName) ->
{Pid, Ref} = spawn_monitor(fun() ->
DaemonPid = whereis(couch_compaction_daemon),
DbPid = couch_util:with_db(DbName, fun(Db) ->
- couch_db:get_pid(Db)
+ Db#db.main_pid
end),
{ok, ViewPid} = couch_index_server:get_index(couch_mrview_index,
DbName, <<"_design/foo">>),
@@ -257,7 +257,7 @@ spawn_compaction_monitor(DbName) ->
end),
receive
{Pid, started} -> ok;
- {'DOWN', Ref, _, _, _} -> erlang:error(monitor_failure)
+ {'DOWN', Ref, _, _, Reason} -> erlang:error({monitor_failure, Reason})
after ?TIMEOUT ->
erlang:error({assertion_failed, [
{module, ?MODULE},