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 703F217CDB for ; Thu, 23 Apr 2015 20:51:11 +0000 (UTC) Received: (qmail 55729 invoked by uid 500); 23 Apr 2015 20:51:11 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 55678 invoked by uid 500); 23 Apr 2015 20:51:11 -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 55666 invoked by uid 99); 23 Apr 2015 20:51:11 -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, 23 Apr 2015 20:51:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2DEB4E17F5; Thu, 23 Apr 2015 20:51:11 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: chttpd commit: updated refs/heads/master to f3662ac Date: Thu, 23 Apr 2015 20:51:11 +0000 (UTC) Repository: couchdb-chttpd Updated Branches: refs/heads/master 79e7eba3e -> f3662acb4 Fix chttpd tests using new test_util:start_applications protocol Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/f3662acb Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/f3662acb Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/f3662acb Branch: refs/heads/master Commit: f3662acb44008dda66cfccb6eddc4330fe9bfd6e Parents: 79e7eba Author: Alexander Shorin Authored: Thu Apr 23 23:50:54 2015 +0300 Committer: Alexander Shorin Committed: Thu Apr 23 23:50:54 2015 +0300 ---------------------------------------------------------------------- src/chttpd_test_util.erl | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/f3662acb/src/chttpd_test_util.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_test_util.erl b/src/chttpd_test_util.erl index a4e4c10..7a71ccf 100644 --- a/src/chttpd_test_util.erl +++ b/src/chttpd_test_util.erl @@ -12,7 +12,7 @@ -module(chttpd_test_util). --export([start_couch/0, start_couch/1, stop_couch/0, stop_couch/1]). +-export([start_couch/0, start_couch/1, stop_couch/1]). -include_lib("couch/include/couch_eunit.hrl"). @@ -23,22 +23,7 @@ start_couch() -> start_couch(IniFiles) -> ok = application:set_env(config, ini_files, IniFiles), ok = lager:start(), - ok = test_util:start_applications([inets, ibrowse, ssl, config, couch, chttpd]), - ok. - - -stop_couch() -> - ok = application:stop(couch), - ok = application:stop(lager), - ok = application:stop(goldrush), - ok = application:stop(config), - ok = application:stop(ssl), - ok = application:stop(ibrowse), - ok = application:stop(inets), - ok = application:stop(chttpd), - ok. - - -stop_couch(_) -> - stop_couch(). + test_util:start_applications([inets, ibrowse, ssl, config, couch, chttpd]). +stop_couch(Ctx) -> + test_util:stop_couch(Ctx).