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 6CDA811A7B for ; Fri, 15 Aug 2014 20:03:31 +0000 (UTC) Received: (qmail 16150 invoked by uid 500); 15 Aug 2014 20:03:31 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 16070 invoked by uid 500); 15 Aug 2014 20:03:31 -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 16048 invoked by uid 99); 15 Aug 2014 20:03:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2014 20:03:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F42159C5A54; Fri, 15 Aug 2014 20:03:30 +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: Fri, 15 Aug 2014 20:03:30 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/11] couch commit: updated refs/heads/1963-eunit-bigcouch to 474fe7d Repository: couchdb-couch Updated Branches: refs/heads/1963-eunit-bigcouch 661443fb0 -> 474fe7de5 Update include paths Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/d99c2875 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/d99c2875 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/d99c2875 Branch: refs/heads/1963-eunit-bigcouch Commit: d99c28756b392562e9886926b0612fa6b933a01d Parents: 661443f Author: Russell Branca Authored: Mon Aug 11 14:50:15 2014 -0700 Committer: Russell Branca Committed: Mon Aug 11 14:50:15 2014 -0700 ---------------------------------------------------------------------- test/couch_auth_cache_tests.erl | 18 ++---------------- test/couch_btree_tests.erl | 4 ++-- test/couch_changes_tests.erl | 4 ++-- test/couch_config_tests.erl | 4 ++-- test/couch_db_tests.erl | 2 +- test/couch_doc_json_tests.erl | 4 ++-- test/couch_file_tests.erl | 2 +- test/couch_key_tree_tests.erl | 2 +- test/couch_passwords_tests.erl | 2 +- test/couch_ref_counter_tests.erl | 4 ++-- test/couch_stats_tests.erl | 4 ++-- test/couch_stream_tests.erl | 2 +- test/couch_task_status_tests.erl | 4 ++-- test/couch_util_tests.erl | 2 +- test/couch_uuids_tests.erl | 2 +- test/couch_work_queue_tests.erl | 2 +- test/couchdb_attachments_tests.erl | 4 ++-- test/couchdb_compaction_daemon.erl | 4 ++-- test/couchdb_cors_tests.erl | 4 ++-- test/couchdb_csp_tests.erl | 2 +- test/couchdb_file_compression_tests.erl | 4 ++-- test/couchdb_http_proxy_tests.erl | 2 +- test/couchdb_os_daemons_tests.erl | 2 +- test/couchdb_os_proc_pool.erl | 4 ++-- test/couchdb_update_conflicts_tests.erl | 4 ++-- test/couchdb_vhosts_tests.erl | 4 ++-- test/couchdb_views_tests.erl | 4 ++-- test/json_stream_parse_tests.erl | 2 +- test/test_web.erl | 2 +- 29 files changed, 45 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_auth_cache_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_auth_cache_tests.erl b/test/couch_auth_cache_tests.erl index 3b2321c..b2c43c3 100644 --- a/test/couch_auth_cache_tests.erl +++ b/test/couch_auth_cache_tests.erl @@ -12,28 +12,14 @@ -module(couch_auth_cache_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}). -define(SALT, <<"SALT">>). -define(TIMEOUT, 1000). -start() -> - {ok, Pid} = couch_server_sup:start_link(?CONFIG_CHAIN), - Pid. - -stop(Pid) -> - erlang:monitor(process, Pid), - couch_server_sup:stop(), - receive - {'DOWN', _, _, Pid, _} -> - ok - after ?TIMEOUT -> - throw({timeout, server_stop}) - end. - setup() -> DbName = ?tempdb(), couch_config:set("couch_httpd_auth", "authentication_db", http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_btree_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_btree_tests.erl b/test/couch_btree_tests.erl index 911640f..60469cf 100644 --- a/test/couch_btree_tests.erl +++ b/test/couch_btree_tests.erl @@ -12,8 +12,8 @@ -module(couch_btree_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(ROWS, 1000). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_changes_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_changes_tests.erl b/test/couch_changes_tests.erl index a129ba2..7fd4c55 100644 --- a/test/couch_changes_tests.erl +++ b/test/couch_changes_tests.erl @@ -12,8 +12,8 @@ -module(couch_changes_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(ADMIN_USER, {user_ctx, #user_ctx{roles = [<<"_admin">>]}}). -define(TIMEOUT, 3000). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_config_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_config_tests.erl b/test/couch_config_tests.erl index 9e9dfe7..91ec5e6 100644 --- a/test/couch_config_tests.erl +++ b/test/couch_config_tests.erl @@ -12,8 +12,8 @@ -module(couch_config_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(SHORT_TIMEOUT, 100). -define(TIMEOUT, 1000). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_db_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_db_tests.erl b/test/couch_db_tests.erl index 3089714..d1fdf06 100644 --- a/test/couch_db_tests.erl +++ b/test/couch_db_tests.erl @@ -12,7 +12,7 @@ -module(couch_db_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -define(TIMEOUT, 120). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_doc_json_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_doc_json_tests.erl b/test/couch_doc_json_tests.erl index 1592b6b..23fc961 100644 --- a/test/couch_doc_json_tests.erl +++ b/test/couch_doc_json_tests.erl @@ -12,8 +12,8 @@ -module(couch_doc_json_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). setup() -> http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_file_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_file_tests.erl b/test/couch_file_tests.erl index ad13383..9b167ca 100644 --- a/test/couch_file_tests.erl +++ b/test/couch_file_tests.erl @@ -12,7 +12,7 @@ -module(couch_file_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -define(BLOCK_SIZE, 4096). -define(setup(F), {setup, fun setup/0, fun teardown/1, F}). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_key_tree_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_key_tree_tests.erl b/test/couch_key_tree_tests.erl index 753ecc4..7d68902 100644 --- a/test/couch_key_tree_tests.erl +++ b/test/couch_key_tree_tests.erl @@ -12,7 +12,7 @@ -module(couch_key_tree_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -define(DEPTH, 10). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_passwords_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_passwords_tests.erl b/test/couch_passwords_tests.erl index 116265c..dea6d6b 100644 --- a/test/couch_passwords_tests.erl +++ b/test/couch_passwords_tests.erl @@ -12,7 +12,7 @@ -module(couch_passwords_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). pbkdf2_test_()-> http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_ref_counter_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_ref_counter_tests.erl b/test/couch_ref_counter_tests.erl index b7e97b4..0217623 100644 --- a/test/couch_ref_counter_tests.erl +++ b/test/couch_ref_counter_tests.erl @@ -12,8 +12,8 @@ -module(couch_ref_counter_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(TIMEOUT, 1000). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_stats_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_stats_tests.erl b/test/couch_stats_tests.erl index d156449..6dbbb6a 100644 --- a/test/couch_stats_tests.erl +++ b/test/couch_stats_tests.erl @@ -12,8 +12,8 @@ -module(couch_stats_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(STATS_CFG_FIXTURE, filename:join([?FIXTURESDIR, "couch_stats_aggregates.cfg"])). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_stream_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_stream_tests.erl b/test/couch_stream_tests.erl index 335a2fe..3e84ca0 100644 --- a/test/couch_stream_tests.erl +++ b/test/couch_stream_tests.erl @@ -12,7 +12,7 @@ -module(couch_stream_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). setup() -> http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_task_status_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_task_status_tests.erl b/test/couch_task_status_tests.erl index f71ad2b..200cee1 100644 --- a/test/couch_task_status_tests.erl +++ b/test/couch_task_status_tests.erl @@ -12,8 +12,8 @@ -module(couch_task_status_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(TIMEOUT, 1000). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_util_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_util_tests.erl b/test/couch_util_tests.erl index 8e24e72..17e6942 100644 --- a/test/couch_util_tests.erl +++ b/test/couch_util_tests.erl @@ -12,7 +12,7 @@ -module(couch_util_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). setup() -> http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_uuids_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_uuids_tests.erl b/test/couch_uuids_tests.erl index ea1d034..754a49b 100644 --- a/test/couch_uuids_tests.erl +++ b/test/couch_uuids_tests.erl @@ -12,7 +12,7 @@ -module(couch_uuids_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -define(TIMEOUT_S, 20). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couch_work_queue_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_work_queue_tests.erl b/test/couch_work_queue_tests.erl index 8a463b5..c94dc00 100644 --- a/test/couch_work_queue_tests.erl +++ b/test/couch_work_queue_tests.erl @@ -12,7 +12,7 @@ -module(couch_work_queue_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -define(TIMEOUT, 100). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_attachments_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_attachments_tests.erl b/test/couchdb_attachments_tests.erl index cf59785..70587f8 100644 --- a/test/couchdb_attachments_tests.erl +++ b/test/couchdb_attachments_tests.erl @@ -12,8 +12,8 @@ -module(couchdb_attachments_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(COMPRESSION_LEVEL, 8). -define(ATT_BIN_NAME, <<"logo.png">>). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_compaction_daemon.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_compaction_daemon.erl b/test/couchdb_compaction_daemon.erl index 725a97b..39e6118 100644 --- a/test/couchdb_compaction_daemon.erl +++ b/test/couchdb_compaction_daemon.erl @@ -12,8 +12,8 @@ -module(couchdb_compaction_daemon). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}). -define(DELAY, 100). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_cors_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_cors_tests.erl b/test/couchdb_cors_tests.erl index 4e88ae7..9f927c4 100644 --- a/test/couchdb_cors_tests.erl +++ b/test/couchdb_cors_tests.erl @@ -12,8 +12,8 @@ -module(couchdb_cors_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_csp_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_csp_tests.erl b/test/couchdb_csp_tests.erl index adb0e6d..9733ad4 100644 --- a/test/couchdb_csp_tests.erl +++ b/test/couchdb_csp_tests.erl @@ -12,7 +12,7 @@ -module(couchdb_csp_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -define(TIMEOUT, 1000). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_file_compression_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_file_compression_tests.erl b/test/couchdb_file_compression_tests.erl index fd3f513..dc3f939 100644 --- a/test/couchdb_file_compression_tests.erl +++ b/test/couchdb_file_compression_tests.erl @@ -12,8 +12,8 @@ -module(couchdb_file_compression_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}). -define(DDOC_ID, <<"_design/test">>). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_http_proxy_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_http_proxy_tests.erl b/test/couchdb_http_proxy_tests.erl index acb1974..262eb15 100644 --- a/test/couchdb_http_proxy_tests.erl +++ b/test/couchdb_http_proxy_tests.erl @@ -12,7 +12,7 @@ -module(couchdb_http_proxy_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -record(req, {method=get, path="", headers=[], body="", opts=[]}). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_os_daemons_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_os_daemons_tests.erl b/test/couchdb_os_daemons_tests.erl index aa949c9..ef21f58 100644 --- a/test/couchdb_os_daemons_tests.erl +++ b/test/couchdb_os_daemons_tests.erl @@ -12,7 +12,7 @@ -module(couchdb_os_daemons_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). %% keep in sync with couchdb/couch_os_daemons.erl -record(daemon, { http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_os_proc_pool.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_os_proc_pool.erl b/test/couchdb_os_proc_pool.erl index 1bb266e..1a37bd6 100644 --- a/test/couchdb_os_proc_pool.erl +++ b/test/couchdb_os_proc_pool.erl @@ -12,8 +12,8 @@ -module(couchdb_os_proc_pool). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(TIMEOUT, 3000). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_update_conflicts_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_update_conflicts_tests.erl b/test/couchdb_update_conflicts_tests.erl index 7226860..adf1e5c 100644 --- a/test/couchdb_update_conflicts_tests.erl +++ b/test/couchdb_update_conflicts_tests.erl @@ -12,8 +12,8 @@ -module(couchdb_update_conflicts_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(i2l(I), integer_to_list(I)). -define(ADMIN_USER, {userctx, #user_ctx{roles=[<<"_admin">>]}}). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_vhosts_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_vhosts_tests.erl b/test/couchdb_vhosts_tests.erl index 94b1957..fc55c1c 100644 --- a/test/couchdb_vhosts_tests.erl +++ b/test/couchdb_vhosts_tests.erl @@ -12,8 +12,8 @@ -module(couchdb_vhosts_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}). -define(TIMEOUT, 1000). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/couchdb_views_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_views_tests.erl b/test/couchdb_views_tests.erl index 6d81f32..24b5e5b 100644 --- a/test/couchdb_views_tests.erl +++ b/test/couchdb_views_tests.erl @@ -12,8 +12,8 @@ -module(couchdb_views_tests). --include("couch_eunit.hrl"). --include_lib("couchdb/couch_db.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). -include_lib("couch_mrview/include/couch_mrview.hrl"). -define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/json_stream_parse_tests.erl ---------------------------------------------------------------------- diff --git a/test/json_stream_parse_tests.erl b/test/json_stream_parse_tests.erl index 92303b6..ffcf918 100644 --- a/test/json_stream_parse_tests.erl +++ b/test/json_stream_parse_tests.erl @@ -12,7 +12,7 @@ -module(json_stream_parse_tests). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -define(CASES, [ http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/d99c2875/test/test_web.erl ---------------------------------------------------------------------- diff --git a/test/test_web.erl b/test/test_web.erl index 1de2cd1..98172d0 100644 --- a/test/test_web.erl +++ b/test/test_web.erl @@ -13,7 +13,7 @@ -module(test_web). -behaviour(gen_server). --include("couch_eunit.hrl"). +-include_lib("couch/include/couch_eunit.hrl"). -export([start_link/0, stop/0, loop/1, get_port/0, set_assert/1, check_last/0]). -export([init/1, terminate/2, code_change/3]).