Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2EC4F17D39 for ; Sat, 4 Apr 2015 23:28:57 +0000 (UTC) Received: (qmail 44127 invoked by uid 500); 4 Apr 2015 23:28:56 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 44024 invoked by uid 500); 4 Apr 2015 23:28:56 -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 43914 invoked by uid 99); 4 Apr 2015 23:28:56 -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; Sat, 04 Apr 2015 23:28:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 625C8E1835; Sat, 4 Apr 2015 23:28:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Sat, 04 Apr 2015 23:29:03 -0000 Message-Id: <43b2b37df5e24c029d19b7c6c83a734e@git.apache.org> In-Reply-To: <7e6f3f454a6141008e620dd6cb309fa6@git.apache.org> References: <7e6f3f454a6141008e620dd6cb309fa6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/48] couch commit: updated refs/heads/master to 7776921 Use shutdown reason instead of normal for exit/2 COUCHDB-2547 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/bc1963fa Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/bc1963fa Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/bc1963fa Branch: refs/heads/master Commit: bc1963fa0337843aa45832f76a9c5dafdbd4d05c Parents: cd6aed0 Author: ILYA Khlopotov Authored: Tue Jan 27 10:19:36 2015 -0800 Committer: ILYA Khlopotov Committed: Tue Feb 10 10:39:54 2015 -0800 ---------------------------------------------------------------------- test/couchdb_os_daemons_tests.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/bc1963fa/test/couchdb_os_daemons_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_os_daemons_tests.erl b/test/couchdb_os_daemons_tests.erl index 0b6383e..f788e25 100644 --- a/test/couchdb_os_daemons_tests.erl +++ b/test/couchdb_os_daemons_tests.erl @@ -57,7 +57,7 @@ teardown(_, {CfgPid, OsDPid}) -> end, test_util:stop_sync_throw(OsPid, fun() -> - exit(OsDPid, normal) + exit(OsDPid, shutdown) end, {timeout, os_daemon_stop}, ?TIMEOUT).