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 1E27B10856 for ; Tue, 3 Jun 2014 15:54:40 +0000 (UTC) Received: (qmail 39332 invoked by uid 500); 3 Jun 2014 15:54:40 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 39204 invoked by uid 500); 3 Jun 2014 15:54:39 -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 39190 invoked by uid 99); 3 Jun 2014 15:54:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2014 15:54:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B1859942522; Tue, 3 Jun 2014 15:54:39 +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: Tue, 03 Jun 2014 15:54:40 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/36] couchdb commit: updated refs/heads/1963-eunit to 85f2750 Port 001-load.t etap test suite to eunit Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a57684c2 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a57684c2 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a57684c2 Branch: refs/heads/1963-eunit Commit: a57684c2eb7d15c0fc72885910a0029f8f212f03 Parents: 9427d69 Author: Alexander Shorin Authored: Fri May 16 04:45:38 2014 +0400 Committer: Alexander Shorin Committed: Tue Jun 3 02:16:40 2014 +0400 ---------------------------------------------------------------------- test/couchdb/Makefile.am | 1 + test/couchdb/couchdb_modules_load_tests.erl | 69 ++++++++++++++++++++++++ test/etap/001-load.t | 68 ----------------------- test/etap/Makefile.am | 1 - 4 files changed, 70 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/a57684c2/test/couchdb/Makefile.am ---------------------------------------------------------------------- diff --git a/test/couchdb/Makefile.am b/test/couchdb/Makefile.am index fac5648..4802082 100644 --- a/test/couchdb/Makefile.am +++ b/test/couchdb/Makefile.am @@ -17,6 +17,7 @@ all: chmod +x run eunit_files = \ + couchdb_modules_load_tests.erl \ couchdb_tests.hrl EXTRA_DIST = \ http://git-wip-us.apache.org/repos/asf/couchdb/blob/a57684c2/test/couchdb/couchdb_modules_load_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb/couchdb_modules_load_tests.erl b/test/couchdb/couchdb_modules_load_tests.erl new file mode 100644 index 0000000..eb1ddcb --- /dev/null +++ b/test/couchdb/couchdb_modules_load_tests.erl @@ -0,0 +1,69 @@ +% 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(couchdb_modules_load_tests). + +-include_lib("couchdb_tests.hrl"). + + +modules_load_test_() -> + { + "Verify that all modules loads", + should_load_modules() + }. + + +should_load_modules() -> + Modules = [ + couch_auth_cache, + couch_btree, + couch_changes, + couch_compress, + couch_config, + couch_config_writer, + couch_db, + couch_db_update_notifier, + couch_db_update_notifier_sup, + couch_db_updater, + couch_doc, + % Fails unless couch_config gen_server is started. + % couch_ejson_compare, + couch_event_sup, + couch_external_manager, + couch_external_server, + couch_file, + couch_httpd, + couch_httpd_db, + couch_httpd_external, + couch_httpd_misc_handlers, + couch_httpd_rewrite, + couch_httpd_stats_handlers, + couch_key_tree, + couch_log, + couch_os_process, + couch_query_servers, + couch_ref_counter, + couch_server, + couch_server_sup, + couch_stats_aggregator, + couch_stats_collector, + couch_stream, + couch_task_status, + couch_util, + couch_work_queue, + json_stream_parse + ], + [should_load_module(Mod) || Mod <- Modules]. + +should_load_module(Mod) -> + {atom_to_list(Mod), ?_assertMatch({module, _}, code:load_file(Mod))}. http://git-wip-us.apache.org/repos/asf/couchdb/blob/a57684c2/test/etap/001-load.t ---------------------------------------------------------------------- diff --git a/test/etap/001-load.t b/test/etap/001-load.t deleted file mode 100755 index 5ce0d93..0000000 --- a/test/etap/001-load.t +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env escript -%% -*- erlang -*- - -% 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. - -% Test that we can load each module. - -main(_) -> - test_util:init_code_path(), - Modules = [ - couch_auth_cache, - couch_btree, - couch_changes, - couch_compress, - couch_config, - couch_config_writer, - couch_db, - couch_db_update_notifier, - couch_db_update_notifier_sup, - couch_db_updater, - couch_doc, - % Fails unless couch_config gen_server is started. - % couch_ejson_compare, - couch_event_sup, - couch_external_manager, - couch_external_server, - couch_file, - couch_httpd, - couch_httpd_db, - couch_httpd_external, - couch_httpd_misc_handlers, - couch_httpd_rewrite, - couch_httpd_stats_handlers, - couch_key_tree, - couch_log, - couch_os_process, - couch_query_servers, - couch_ref_counter, - couch_server, - couch_server_sup, - couch_stats_aggregator, - couch_stats_collector, - couch_stream, - couch_task_status, - couch_util, - couch_work_queue, - json_stream_parse - ], - - etap:plan(length(Modules)), - lists:foreach( - fun(Module) -> - etap:loaded_ok( - Module, - lists:concat(["Loaded: ", Module]) - ) - end, Modules), - etap:end_tests(). http://git-wip-us.apache.org/repos/asf/couchdb/blob/a57684c2/test/etap/Makefile.am ---------------------------------------------------------------------- diff --git a/test/etap/Makefile.am b/test/etap/Makefile.am index c9778ca..ff7f730 100644 --- a/test/etap/Makefile.am +++ b/test/etap/Makefile.am @@ -36,7 +36,6 @@ fixture_files = \ fixtures/test.couch tap_files = \ - 001-load.t \ 002-icu-driver.t \ 010-file-basics.t \ 011-file-headers.t \