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 BC7C7115D3 for ; Thu, 28 Aug 2014 22:35:21 +0000 (UTC) Received: (qmail 66238 invoked by uid 500); 28 Aug 2014 22:35:21 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 66067 invoked by uid 500); 28 Aug 2014 22:35:21 -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 65863 invoked by uid 99); 28 Aug 2014 22:35:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 22:35:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4011D82CCBF; Thu, 28 Aug 2014 22:35:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org Date: Thu, 28 Aug 2014 22:35:24 -0000 Message-Id: In-Reply-To: <5c5f7e03fdc141d78322785376a5022b@git.apache.org> References: <5c5f7e03fdc141d78322785376a5022b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/11] config commit: updated refs/heads/1963-eunit-bigcouch to 7a8e21e Port 083-config-no-files.t etap test suite to eunit Merged into couch_config_tests suite. Project: http://git-wip-us.apache.org/repos/asf/couchdb-config/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-config/commit/928b23ff Tree: http://git-wip-us.apache.org/repos/asf/couchdb-config/tree/928b23ff Diff: http://git-wip-us.apache.org/repos/asf/couchdb-config/diff/928b23ff Branch: refs/heads/1963-eunit-bigcouch Commit: 928b23ff1d991e77989ab3941d03c6073c03f8d6 Parents: 25f0897 Author: Alexander Shorin Authored: Mon May 26 09:46:06 2014 +0400 Committer: Russell Branca Committed: Thu Aug 28 13:57:39 2014 -0700 ---------------------------------------------------------------------- test/couchdb/couch_config_tests.erl | 37 +++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-config/blob/928b23ff/test/couchdb/couch_config_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb/couch_config_tests.erl b/test/couchdb/couch_config_tests.erl index fdd2479..9e9dfe7 100644 --- a/test/couchdb/couch_config_tests.erl +++ b/test/couchdb/couch_config_tests.erl @@ -44,6 +44,9 @@ setup(Chain) -> {ok, Pid} = couch_config:start_link(Chain), Pid. +setup_empty() -> + setup([]). + setup_register() -> ConfigPid = setup(), SentinelFunc = fun() -> @@ -92,7 +95,8 @@ couch_config_test_() -> couch_config_del_tests(), config_override_tests(), config_persistent_changes_tests(), - config_register_tests() + config_register_tests(), + config_no_files_tests() ] }. @@ -195,6 +199,20 @@ config_register_tests() -> } }. +config_no_files_tests() -> + { + "Test couch_config with no files", + { + foreach, + fun setup_empty/0, fun teardown/1, + [ + should_ensure_that_no_ini_files_loaded(), + should_create_non_persistent_option(), + should_create_persistent_option() + ] + } + }. + should_load_all_configs() -> ?_assert(length(couch_config:all()) > 0). @@ -426,3 +444,20 @@ should_not_trigger_handler_after_related_process_death({_, SentinelPid}) -> true end end). + +should_ensure_that_no_ini_files_loaded() -> + ?_assertEqual(0, length(couch_config:all())). + +should_create_non_persistent_option() -> + ?_assertEqual("80", + begin + ok = couch_config:set("httpd", "port", "80", false), + couch_config:get("httpd", "port") + end). + +should_create_persistent_option() -> + ?_assertEqual("127.0.0.1", + begin + ok = couch_config:set("httpd", "bind_address", "127.0.0.1"), + couch_config:get("httpd", "bind_address") + end).