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 B617817D3C for ; Sat, 4 Apr 2015 23:28:57 +0000 (UTC) Received: (qmail 45664 invoked by uid 500); 4 Apr 2015 23:28:57 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 45410 invoked by uid 500); 4 Apr 2015 23:28:57 -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 44132 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 760B9E2F71; 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:19 -0000 Message-Id: <5f42e70d32804750bcb19cf5f0a79cf7@git.apache.org> In-Reply-To: <7e6f3f454a6141008e620dd6cb309fa6@git.apache.org> References: <7e6f3f454a6141008e620dd6cb309fa6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/48] couch commit: updated refs/heads/master to 7776921 Enable couch_uuid_tests 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/c2d3d457 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/c2d3d457 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/c2d3d457 Branch: refs/heads/master Commit: c2d3d4571b38ddb7499681d694ae5f03f69417f7 Parents: 9985c2c Author: ILYA Khlopotov Authored: Tue Feb 3 07:08:24 2015 -0800 Committer: ILYA Khlopotov Committed: Tue Feb 10 11:04:36 2015 -0800 ---------------------------------------------------------------------- test/couch_uuids_tests.erl | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c2d3d457/test/couch_uuids_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_uuids_tests.erl b/test/couch_uuids_tests.erl index defea4f..a836ecc 100644 --- a/test/couch_uuids_tests.erl +++ b/test/couch_uuids_tests.erl @@ -17,12 +17,10 @@ -define(TIMEOUT_S, 20). --ifdef(run_broken_tests). - setup() -> - {ok, Pid} = config:start_link(?CONFIG_CHAIN), + Ctx = test_util:start(?MODULE, [], [{dont_mock, [config]}]), couch_uuids:start(), - Pid. + Ctx. setup(Opts) -> Pid = setup(), @@ -32,12 +30,12 @@ setup(Opts) -> end, Opts), Pid. -teardown(Pid) -> +teardown(Ctx) -> couch_uuids:stop(), - test_util:stop_config(Pid). + test_util:stop(Ctx). -teardown(_, Pid) -> - teardown(Pid). +teardown(_, Ctx) -> + teardown(Ctx). default_test_() -> @@ -155,5 +153,3 @@ test_same_suffix(N, Suffix) -> Suffix -> test_same_suffix(N - 1, Suffix); _ -> false end. - --endif.