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 1AEC111E25 for ; Mon, 25 Aug 2014 20:19:52 +0000 (UTC) Received: (qmail 84279 invoked by uid 500); 25 Aug 2014 20:19:52 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 84229 invoked by uid 500); 25 Aug 2014 20:19:51 -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 84208 invoked by uid 99); 25 Aug 2014 20:19:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Aug 2014 20:19:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 888A8A03E4C; Mon, 25 Aug 2014 20:19:51 +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: Mon, 25 Aug 2014 20:19:51 -0000 Message-Id: <68b81aff03fd4526b6ab8f6ac3d280e4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/12] couch commit: updated refs/heads/1963-eunit-bigcouch to c869805 Repository: couchdb-couch Updated Branches: refs/heads/1963-eunit-bigcouch 95bfc0360 -> c8698058e (forced update) WIP: Add test_util The addition of start_config here is suboptimal, but starting couch requires config to be running, and a number of the tests also want config running, so this is a (temporary?) workaround to make sure you can always get a fresh config instance. Currently the request function is unused, but I think we should migrate tests making requests to use it. Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/c3fe418f Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/c3fe418f Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/c3fe418f Branch: refs/heads/1963-eunit-bigcouch Commit: c3fe418f1db7afe7481ff2771f3d5d7b0a1aa3b3 Parents: 7114666 Author: Russell Branca Authored: Fri Aug 15 12:56:57 2014 -0700 Committer: Russell Branca Committed: Mon Aug 25 13:06:00 2014 -0700 ---------------------------------------------------------------------- src/test_util.erl | 142 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c3fe418f/src/test_util.erl ---------------------------------------------------------------------- diff --git a/src/test_util.erl b/src/test_util.erl new file mode 100644 index 0000000..787ff01 --- /dev/null +++ b/src/test_util.erl @@ -0,0 +1,142 @@ +% Licensed under the Apache License, Version 2.0 (the "License"); you may not +% use this file except in compliance with the License. You may obtain a copy of +% the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +% License for the specific language governing permissions and limitations under +% the License. + +-module(test_util). + +-export([init_code_path/0]). +-export([source_file/1, build_file/1, config_files/0]). +%% -export([run/2]). +-export([request/3, request/4]). +-export([start_couch/0, start_couch/1, stop_couch/0, stop_couch/1]). +-export([start_config/1, stop_config/1]). + + +srcdir() -> + code:priv_dir(couch) ++ "/../../". + +builddir() -> + code:priv_dir(couch) ++ "/../../../". + +init_code_path() -> + Paths = [ + "etap", + "couchdb", + "ejson", + "oauth", + "ibrowse", + "mochiweb", + "snappy" + ], + lists:foreach(fun(Name) -> + code:add_patha(filename:join([builddir(), "src", Name])) + end, Paths). + +source_file(Name) -> + filename:join([srcdir(), Name]). + +build_file(Name) -> + filename:join([builddir(), Name]). + +config_files() -> + [ + build_file("etc/couchdb/default_dev.ini"), + build_file("test/random_port.ini"), + build_file("etc/couchdb/local_dev.ini") + ]. + + +request(Url, Headers, Method) -> + request(Url, Headers, Method, []). + +request(Url, Headers, Method, Body) -> + request(Url, Headers, Method, Body, 3). + +request(_Url, _Headers, _Method, _Body, 0) -> + {error, request_failed}; +request(Url, Headers, Method, Body, N) -> + case code:is_loaded(ibrowse) of + false -> + {ok, _} = ibrowse:start(); + _ -> + ok + end, + case ibrowse:send_req(Url, Headers, Method, Body) of + {ok, Code0, RespHeaders, RespBody0} -> + Code = list_to_integer(Code0), + RespBody = iolist_to_binary(RespBody0), + {ok, Code, RespHeaders, RespBody}; + {error, {'EXIT', {normal, _}}} -> + % Connection closed right after a successful request that + % used the same connection. + request(Url, Headers, Method, Body, N - 1); + Error -> + Error + end. + + +start_couch() -> + start_couch(config_files()). + + +start_couch(IniFiles) -> + ok = application:set_env(config, ini_files, IniFiles), + ok = lager:start(), + ok = start_applications([config, couch]), + ok. + + +stop_couch() -> + ok = application:stop(couch), + ok = application:stop(lager), + ok = application:stop(goldrush), + ok = application:stop(config), + ok. + + +stop_couch(_) -> + stop_couch(). + + +start_applications([]) -> + ok; +start_applications([App|Apps]) -> + case application:start(App) of + {error, {already_started, _}} -> + ok; + {error, {not_started, Dep}} -> + start_applications([Dep, App | Apps]); + ok -> + ok + end, + start_applications(Apps). + + +start_config(Chain) -> + case config:start_link(Chain) of + {ok, Pid} -> + {ok, Pid}; + {error, {already_started, OldPid}} -> + ok = stop_config(OldPid), + start_config(Chain) + end. + + +stop_config(Pid) -> + Timeout = 1000, + erlang:monitor(process, Pid), + config:stop(), + receive + {'DOWN', _, _, Pid, _} -> + ok + after Timeout -> + throw({timeout_error, config_stop}) + end.