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 7A6EB11EAD for ; Fri, 5 Sep 2014 02:29:44 +0000 (UTC) Received: (qmail 86470 invoked by uid 500); 5 Sep 2014 02:29:42 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 86374 invoked by uid 500); 5 Sep 2014 02:29:42 -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 84873 invoked by uid 99); 5 Sep 2014 02:29:41 -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, 05 Sep 2014 02:29:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9D01DA09338; Fri, 5 Sep 2014 02:29:41 +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, 05 Sep 2014 02:30:25 -0000 Message-Id: <743c7063b4e74d30a0cfc6099bb0113b@git.apache.org> In-Reply-To: <957aa26b75c1412cb5bef9aad2956866@git.apache.org> References: <957aa26b75c1412cb5bef9aad2956866@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] [abbrv] couch commit: updated refs/heads/1963-eunit-bigcouch to 2b2f129 Disable problematic 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/978c1bc8 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/978c1bc8 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/978c1bc8 Branch: refs/heads/1963-eunit-bigcouch Commit: 978c1bc879725c21166a4626d3e87ae7305e1211 Parents: 149cd82 Author: Russell Branca Authored: Tue Aug 26 10:54:22 2014 -0700 Committer: Russell Branca Committed: Thu Sep 4 14:37:35 2014 -0700 ---------------------------------------------------------------------- test/couch_auth_cache_tests.erl | 4 ++++ test/couch_changes_tests.erl | 4 ++++ test/couch_doc_json_tests.erl | 5 +++++ test/couch_stats_tests.erl | 4 ++++ test/couch_uuids_tests.erl | 4 ++++ test/couchdb_attachments_tests.erl | 4 ++++ test/couchdb_compaction_daemon.erl | 4 ++++ test/couchdb_file_compression_tests.erl | 4 ++++ test/couchdb_http_proxy_tests.erl | 5 +++++ test/couchdb_os_daemons_tests.erl | 4 ++++ test/couchdb_os_proc_pool.erl | 4 ++++ test/couchdb_vhosts_tests.erl | 4 ++++ test/couchdb_views_tests.erl | 4 ++++ 13 files changed, 54 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couch_auth_cache_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_auth_cache_tests.erl b/test/couch_auth_cache_tests.erl index afad552..d8841bd 100644 --- a/test/couch_auth_cache_tests.erl +++ b/test/couch_auth_cache_tests.erl @@ -19,6 +19,8 @@ -define(TIMEOUT, 1000). +-ifdef(run_broken_tests). + setup() -> DbName = ?tempdb(), config:set("couch_httpd_auth", "authentication_db", @@ -221,3 +223,5 @@ full_commit(DbName) -> {ok, AuthDb} = couch_db:open_int(DbName, [?ADMIN_USER]), {ok, _} = couch_db:ensure_full_commit(AuthDb), ok = couch_db:close(AuthDb). + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couch_changes_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_changes_tests.erl b/test/couch_changes_tests.erl index 64754fa..7122035 100644 --- a/test/couch_changes_tests.erl +++ b/test/couch_changes_tests.erl @@ -25,6 +25,8 @@ }). +-ifdef(run_broken_tests). + setup() -> DbName = ?tempdb(), {ok, Db} = create_db(DbName), @@ -595,3 +597,5 @@ create_db(DbName) -> delete_db(DbName) -> ok = couch_server:delete(DbName, [?ADMIN_USER]). + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couch_doc_json_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_doc_json_tests.erl b/test/couch_doc_json_tests.erl index 64dea96..20010ac 100644 --- a/test/couch_doc_json_tests.erl +++ b/test/couch_doc_json_tests.erl @@ -16,6 +16,8 @@ -include_lib("couch/include/couch_db.hrl"). +-ifdef(run_broken_tests). + setup() -> {ok, Pid} = test_util:start_config(?CONFIG_CHAIN), config:set("attachments", "compression_level", "0", false), @@ -389,3 +391,6 @@ to_json_success_cases() -> ({Options, Doc, EJson, Msg}) -> {Msg, ?_assertMatch(EJson, couch_doc:to_json_obj(Doc, Options))} end, Cases). + +-endif. + http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couch_stats_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_stats_tests.erl b/test/couch_stats_tests.erl index d62afaf..fd4c8e1 100644 --- a/test/couch_stats_tests.erl +++ b/test/couch_stats_tests.erl @@ -23,6 +23,8 @@ -define(TIMEWAIT, 500). +-ifdef(run_broken_tests). + setup_collector() -> couch_stats_collector:start(), ok. @@ -410,3 +412,5 @@ make_agg(Desc, Sum, Mean, StdDev, Min, Max) -> {min, Min}, {max, Max} ]}. + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couch_uuids_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_uuids_tests.erl b/test/couch_uuids_tests.erl index 27c5cb8..6d91b4c 100644 --- a/test/couch_uuids_tests.erl +++ b/test/couch_uuids_tests.erl @@ -17,6 +17,8 @@ -define(TIMEOUT_S, 20). +-ifdef(run_broken_tests). + setup() -> {ok, Pid} = config:start_link(?CONFIG_CHAIN), erlang:monitor(process, Pid), @@ -159,3 +161,5 @@ test_same_suffix(N, Suffix) -> Suffix -> test_same_suffix(N - 1, Suffix); _ -> false end. + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couchdb_attachments_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_attachments_tests.erl b/test/couchdb_attachments_tests.erl index b203a82..78f9f49 100644 --- a/test/couchdb_attachments_tests.erl +++ b/test/couchdb_attachments_tests.erl @@ -26,6 +26,8 @@ -define(i2l(I), integer_to_list(I)). +-ifdef(run_broken_tests). + start() -> ok = test_util:start_couch(), % ensure in default compression settings for attachments_compression_tests @@ -626,3 +628,5 @@ gzip(Data) -> ok = zlib:deflateEnd(Z), ok = zlib:close(Z), Last. + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couchdb_compaction_daemon.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_compaction_daemon.erl b/test/couchdb_compaction_daemon.erl index 0d2195b..69b7f56 100644 --- a/test/couchdb_compaction_daemon.erl +++ b/test/couchdb_compaction_daemon.erl @@ -20,6 +20,8 @@ -define(TIMEOUT_S, ?TIMEOUT div 1000). +-ifdef(run_broken_tests). + start() -> ok = test_util:start_couch(), config:set("compaction_daemon", "check_interval", "3", false), @@ -218,3 +220,5 @@ wait_loop(DbName, Parent) -> ok = timer:sleep(?DELAY), wait_loop(DbName, Parent) end. + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couchdb_file_compression_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_file_compression_tests.erl b/test/couchdb_file_compression_tests.erl index 8f590b9..d140474 100644 --- a/test/couchdb_file_compression_tests.erl +++ b/test/couchdb_file_compression_tests.erl @@ -20,6 +20,8 @@ -define(TIMEOUT, 30000). +-ifdef(run_broken_tests). + setup() -> config:set("couchdb", "file_compression", "none", false), DbName = ?tempdb(), @@ -222,3 +224,5 @@ view_disk_size(DbName) -> {ok, Info} = couch_mrview:get_info(Db, DDoc), ok = couch_db:close(Db), couch_util:get_value(disk_size, Info). + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couchdb_http_proxy_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_http_proxy_tests.erl b/test/couchdb_http_proxy_tests.erl index cee6a02..28ac02a 100644 --- a/test/couchdb_http_proxy_tests.erl +++ b/test/couchdb_http_proxy_tests.erl @@ -27,6 +27,8 @@ -define(TIMEOUT, 5000). +-ifdef(run_broken_tests). + start() -> % we have to write any config changes to temp ini file to not loose them % when supervisor will kill all children due to reaching restart threshold @@ -456,3 +458,6 @@ recv_body(ReqId, Acc) -> after ?TIMEOUT -> throw({error, timeout}) end. + +-endif. + http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couchdb_os_daemons_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_os_daemons_tests.erl b/test/couchdb_os_daemons_tests.erl index 3eeb7d7..6aea39c 100644 --- a/test/couchdb_os_daemons_tests.erl +++ b/test/couchdb_os_daemons_tests.erl @@ -36,6 +36,8 @@ -define(TIMEOUT, 1000). +-ifdef(run_broken_tests). + setup(DName) -> {ok, CfgPid} = config:start_link(?CONFIG_CHAIN), {ok, OsDPid} = couch_os_daemons:start_link(), @@ -226,3 +228,5 @@ check_dead(D, Name) -> ?assertEqual(halted, D#daemon.status), ?assertEqual(nil, D#daemon.errors), ?assertEqual(nil, D#daemon.buf). + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couchdb_os_proc_pool.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_os_proc_pool.erl b/test/couchdb_os_proc_pool.erl index a8ab752..7f245e8 100644 --- a/test/couchdb_os_proc_pool.erl +++ b/test/couchdb_os_proc_pool.erl @@ -18,6 +18,8 @@ -define(TIMEOUT, 3000). +-ifdef(run_broken_tests). + start() -> ok = test_util:start_couch(), config:set("query_server_config", "os_process_limit", "3", false), @@ -167,3 +169,5 @@ loop(Parent, Ref, Proc) -> Parent ! {die, Ref}, exit(some_error) end. + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couchdb_vhosts_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_vhosts_tests.erl b/test/couchdb_vhosts_tests.erl index 5eb266c..3325219 100644 --- a/test/couchdb_vhosts_tests.erl +++ b/test/couchdb_vhosts_tests.erl @@ -19,6 +19,8 @@ -define(iofmt(S, A), lists:flatten(io_lib:format(S, A))). +-ifdef(run_broken_tests). + setup() -> DbName = ?tempdb(), {ok, Db} = couch_db:create(DbName, [?ADMIN_USER]), @@ -424,3 +426,5 @@ should_fail_oauth_with_wrong_credentials({Url, _}) -> {reason, ?iofmt("Request failed: ~p", [Else])}]}) end end). + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/978c1bc8/test/couchdb_views_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_views_tests.erl b/test/couchdb_views_tests.erl index 012d12e..fd6a3b9 100644 --- a/test/couchdb_views_tests.erl +++ b/test/couchdb_views_tests.erl @@ -20,6 +20,8 @@ -define(TIMEOUT, 1000). +-ifdef(run_broken_tests). + setup() -> DbName = ?tempdb(), {ok, Db} = couch_db:create(DbName, [?ADMIN_USER]), @@ -652,3 +654,5 @@ read_header(File) -> {ok, {_Sig, Header}} = couch_file:read_header(Fd), couch_file:close(Fd), Header. + +-endif.