diff options
-rw-r--r-- | rel/reltool.config | 2 | ||||
-rw-r--r-- | src/chttpd/src/chttpd.app.src | 5 | ||||
-rw-r--r-- | src/couch/src/couch.app.src | 8 | ||||
-rw-r--r-- | src/couch/test/eunit/couch_uuids_tests.erl | 4 | ||||
-rw-r--r-- | src/couch_epi/src/couch_epi.app.src.script | 24 | ||||
-rw-r--r-- | src/couch_epi/test/eunit/couch_epi_tests.erl | 2 | ||||
-rw-r--r-- | src/fabric/test/eunit/fabric_db_create_tests.erl | 4 | ||||
-rw-r--r-- | src/ken/src/ken.app.src.script | 17 | ||||
-rw-r--r-- | src/setup/src/setup.app.src | 29 | ||||
-rw-r--r-- | src/weatherreport/src/weatherreport.app.src | 5 |
10 files changed, 50 insertions, 50 deletions
diff --git a/rel/reltool.config b/rel/reltool.config index ab26fb2ed..a3e9d9cf9 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -38,6 +38,7 @@ couch_plugins, couch_replicator, couch_stats, + couch_tests, couch_event, couch_peruser, couch_dist, @@ -102,6 +103,7 @@ {app, couch_plugins, [{incl_cond, include}]}, {app, couch_replicator, [{incl_cond, include}]}, {app, couch_stats, [{incl_cond, include}]}, + {app, couch_tests, [{incl_cond, include}]}, {app, couch_event, [{incl_cond, include}]}, {app, couch_peruser, [{incl_cond, include}]}, {app, couch_dist ,[{incl_cond, include}]}, diff --git a/src/chttpd/src/chttpd.app.src b/src/chttpd/src/chttpd.app.src index 3526745df..e57c2ee5d 100644 --- a/src/chttpd/src/chttpd.app.src +++ b/src/chttpd/src/chttpd.app.src @@ -10,7 +10,7 @@ % License for the specific language governing permissions and limitations under % the License. - {application, chttpd, [ +{application, chttpd, [ {description, "HTTP interface for CouchDB cluster"}, {vsn, git}, {registered, [ @@ -24,10 +24,11 @@ stdlib, couch_log, couch_stats, + couch_tests, config, couch, ets_lru, fabric ]}, - {mod, {chttpd_app,[]}} + {mod, {chttpd_app, []}} ]}. diff --git a/src/couch/src/couch.app.src b/src/couch/src/couch.app.src index c2d0e0e92..ac4da26b1 100644 --- a/src/couch/src/couch.app.src +++ b/src/couch/src/couch.app.src @@ -40,17 +40,19 @@ % ASF deps couch_epi, + config, b64url, couch_log, couch_event, ioq, couch_stats, + couch_tests, hyper, couch_prometheus, couch_dist ]}, {env, [ - { httpd_global_handlers, [ + {httpd_global_handlers, [ {"/", "{couch_httpd_misc_handlers, handle_welcome_req, <<\"Welcome\">>}"}, {"favicon.ico", "{couch_httpd_misc_handlers, handle_favicon_req, \"{{prefix}}/share/www\"}"}, {"_utils", "{couch_httpd_misc_handlers, handle_utils_dir_req, \"{{prefix}}/share/www\"}"}, @@ -63,7 +65,7 @@ {"_session", "{couch_httpd_auth, handle_session_req}"}, {"_plugins", "{couch_plugins_httpd, handle_req}"} ]}, - { httpd_db_handlers, [ + {httpd_db_handlers, [ {"_all_docs", "{couch_mrview_http, handle_all_docs_req}"}, {"_local_docs", "{couch_mrview_http, handle_local_docs_req}"}, {"_design_docs", "{couch_mrview_http, handle_design_docs_req}"}, @@ -73,7 +75,7 @@ {"_temp_view", "{couch_mrview_http, handle_temp_view_req}"}, {"_view_cleanup", "{couch_mrview_http, handle_cleanup_req}"} ]}, - { httpd_design_handlers, [ + {httpd_design_handlers, [ {"_compact", "{couch_mrview_http, handle_compact_req}"}, {"_info", "{couch_mrview_http, handle_info_req}"}, {"_list", "{couch_mrview_show, handle_view_list_req}"}, diff --git a/src/couch/test/eunit/couch_uuids_tests.erl b/src/couch/test/eunit/couch_uuids_tests.erl index 6546779bb..3dde842cb 100644 --- a/src/couch/test/eunit/couch_uuids_tests.erl +++ b/src/couch/test/eunit/couch_uuids_tests.erl @@ -17,12 +17,12 @@ -define(TIMEOUT, 20). setup_all() -> - test_util:start_applications([config]), + test_util:start_applications([config, couch_log]), couch_uuids:start(). teardown_all(_) -> couch_uuids:stop(), - test_util:stop_applications([config]). + test_util:stop_applications([config, couch_log]). uuids_test_() -> { diff --git a/src/couch_epi/src/couch_epi.app.src.script b/src/couch_epi/src/couch_epi.app.src.script index daa5e4d73..fa858fabd 100644 --- a/src/couch_epi/src/couch_epi.app.src.script +++ b/src/couch_epi/src/couch_epi.app.src.script @@ -13,16 +13,14 @@ ConfigFile = filename:join([os:getenv("COUCHDB_APPS_CONFIG_DIR"), "couch_epi.config"]). {ok, AppConfig} = file:consult(ConfigFile). -{application, couch_epi, - [ - {description, "extensible plugin interface"}, - {vsn, git}, - {registered, [couch_epi_sup, couch_epi_server]}, - {applications, [ - kernel, - stdlib, - crypto - ]}, - {mod, { couch_epi_app, []}}, - {env, AppConfig} - ]}. +{application, couch_epi, [ + {description, "extensible plugin interface"}, + {vsn, git}, + {registered, [couch_epi_sup, couch_epi_server]}, + {applications, [ + kernel, + stdlib + ]}, + {mod, {couch_epi_app, []}}, + {env, AppConfig} +]}. diff --git a/src/couch_epi/test/eunit/couch_epi_tests.erl b/src/couch_epi/test/eunit/couch_epi_tests.erl index 08307fe30..796af1346 100644 --- a/src/couch_epi/test/eunit/couch_epi_tests.erl +++ b/src/couch_epi/test/eunit/couch_epi_tests.erl @@ -174,7 +174,7 @@ start_epi(Plugins) -> Plugins ), application:set_env(couch_epi, plugins, PluginsModules), - application:start(couch_epi). + application:ensure_started(couch_epi). setup(data_file) -> error_logger:tty(false), diff --git a/src/fabric/test/eunit/fabric_db_create_tests.erl b/src/fabric/test/eunit/fabric_db_create_tests.erl index 60acd3031..5720f57d8 100644 --- a/src/fabric/test/eunit/fabric_db_create_tests.erl +++ b/src/fabric/test/eunit/fabric_db_create_tests.erl @@ -44,6 +44,4 @@ t_handle_shard_doc_conflict() -> ]), meck:expect(fabric_util, recv, 4, {error, conflict}), ?assertEqual({error, file_exists}, fabric_db_create:go(DbName, [])), - - meck:unload(), - ok = fabric:delete_db(DbName). + meck:unload(). diff --git a/src/ken/src/ken.app.src.script b/src/ken/src/ken.app.src.script index dcf4a23d1..aad00a7b9 100644 --- a/src/ken/src/ken.app.src.script +++ b/src/ken/src/ken.app.src.script @@ -27,12 +27,11 @@ Applications = if HaveHastings -> [hastings]; true -> [] end ++ BaseApplications. -{application, ken, - [ - {description, ""}, - {vsn, git}, - {registered, []}, - {applications, Applications}, - {mod, { ken_app, []}}, - {env, []} - ]}. +{application, ken, [ + {description, "Ken builds views and search indexes automatically"}, + {vsn, git}, + {registered, []}, + {applications, Applications}, + {mod, {ken_app, []}}, + {env, []} +]}. diff --git a/src/setup/src/setup.app.src b/src/setup/src/setup.app.src index ae685c971..d71dea877 100644 --- a/src/setup/src/setup.app.src +++ b/src/setup/src/setup.app.src @@ -10,18 +10,17 @@ % License for the specific language governing permissions and limitations under % the License. -{application, setup, - [ - {description, ""}, - {vsn, "1"}, - {registered, []}, - {applications, [ - kernel, - stdlib, - couch_epi, - chttpd, - couch_log - ]}, - {mod, { setup_app, []}}, - {env, []} - ]}. +{application, setup, [ + {description, "Implements `_cluster_setup` and manages the setup of a CouchDB cluster"}, + {vsn, "1"}, + {registered, []}, + {applications, [ + kernel, + stdlib, + couch_epi, + chttpd, + couch_log + ]}, + {mod, {setup_app, []}}, + {env, []} +]}. diff --git a/src/weatherreport/src/weatherreport.app.src b/src/weatherreport/src/weatherreport.app.src index 6674fa537..70bd3cdb6 100644 --- a/src/weatherreport/src/weatherreport.app.src +++ b/src/weatherreport/src/weatherreport.app.src @@ -34,6 +34,7 @@ {applications, [ kernel, stdlib, - inets + inets, + config ]} - ]}. +]}. |