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 8F241180F4 for ; Tue, 22 Mar 2016 12:35:18 +0000 (UTC) Received: (qmail 95556 invoked by uid 500); 22 Mar 2016 12:35:18 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 95428 invoked by uid 500); 22 Mar 2016 12:35:18 -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 95331 invoked by uid 99); 22 Mar 2016 12:35:18 -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; Tue, 22 Mar 2016 12:35:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 18738DFB7B; Tue, 22 Mar 2016 12:35:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Tue, 22 Mar 2016 12:35:18 -0000 Message-Id: <53185df3936c4f2c97a4ad62101233c9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] couch commit: updated refs/heads/master to 5fa9098 Repository: couchdb-couch Updated Branches: refs/heads/master b4295bfe5 -> 5fa909871 Use couch_tests applications for couch_db_plugin_tests Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/2a7387c6 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/2a7387c6 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/2a7387c6 Branch: refs/heads/master Commit: 2a7387c6009c147bf7a5901345bd3239df70d1e0 Parents: b4295bf Author: ILYA Khlopotov Authored: Thu Mar 17 10:43:43 2016 -0700 Committer: ILYA Khlopotov Committed: Thu Mar 17 10:43:43 2016 -0700 ---------------------------------------------------------------------- test/couch_db_plugin_tests.erl | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/2a7387c6/test/couch_db_plugin_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_db_plugin_tests.erl b/test/couch_db_plugin_tests.erl index 2fb6e3a..3f69e79 100644 --- a/test/couch_db_plugin_tests.erl +++ b/test/couch_db_plugin_tests.erl @@ -45,15 +45,12 @@ processes() -> []. notify(_, _, _) -> ok. setup() -> - application:stop(couch_epi), % in case it's already running from other tests... - application:unload(couch_epi), - ok = application:load(couch_epi), - ok = application:set_env(couch_epi, plugins, [?MODULE]), % only this plugin - ok = application:start(couch_epi). - -teardown(_) -> - ok = application:stop(couch_epi), - ok = application:unload(couch_epi). + couch_tests:setup([ + couch_epi_dispatch:dispatch(chttpd, ?MODULE) + ], [], []). + +teardown(Ctx) -> + couch_tests:teardown(Ctx). validate_dbname({true, _Db}, _) -> true; validate_dbname({false, _Db}, _) -> false;