Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D12D9200C48 for ; Thu, 6 Apr 2017 18:16:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CFF8E160BAC; Thu, 6 Apr 2017 16:16:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DEF82160BA9 for ; Thu, 6 Apr 2017 18:16:17 +0200 (CEST) Received: (qmail 46693 invoked by uid 500); 6 Apr 2017 16:16:16 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 46161 invoked by uid 99); 6 Apr 2017 16:16:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Apr 2017 16:16:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4081DFE5C; Thu, 6 Apr 2017 16:16:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Thu, 06 Apr 2017 16:16:35 -0000 Message-Id: In-Reply-To: <266130aae7524185b36760e9a2a3df34@git.apache.org> References: <266130aae7524185b36760e9a2a3df34@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/36] couch commit: updated refs/heads/COUCHDB-3287-pluggable-storage-engines to 0fbcd0c archived-at: Thu, 06 Apr 2017 16:16:18 -0000 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/COUCHDB-3287-pluggable-storage-engines Commit: 21c8d37ac6ee1a7fed1de1f54f95a4d3cd9f5248 Parents: f09e321 Author: Paul J. Davis Authored: Thu Mar 23 14:55:48 2017 -0500 Committer: Paul J. Davis 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},