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 59EFE185DF for ; Wed, 2 Dec 2015 23:02:06 +0000 (UTC) Received: (qmail 44408 invoked by uid 500); 2 Dec 2015 23:02:05 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 43738 invoked by uid 500); 2 Dec 2015 23:02:04 -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 41167 invoked by uid 99); 2 Dec 2015 23:02:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2015 23:02:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1FAA5E01C1; Wed, 2 Dec 2015 23:02:02 +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: Wed, 02 Dec 2015 23:02:50 -0000 Message-Id: <9d8603c1d59045cabf0e8ff161f2fa3b@git.apache.org> In-Reply-To: <420563d655c74cdd8457841366bdc54d@git.apache.org> References: <420563d655c74cdd8457841366bdc54d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [50/50] couchdb commit: updated refs/heads/1.x.x to 921006f Merge branch '1963-eunit-1.7' into 1.x.x Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/921006fa Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/921006fa Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/921006fa Branch: refs/heads/1.x.x Commit: 921006fa49b362e5673a6aae4586e832ec325dc6 Parents: ca0ce9b ffe3b33 Author: Alexander Shorin Authored: Thu Dec 3 02:04:44 2015 +0300 Committer: Alexander Shorin Committed: Thu Dec 3 02:04:44 2015 +0300 ---------------------------------------------------------------------- .gitignore | 11 +- .travis.yml | 3 + LICENSE | 25 - Makefile.am | 18 +- NOTICE | 4 - configure.ac | 8 +- license.skip | 18 +- src/Makefile.am | 1 - src/couch_mrview/Makefile.am | 16 +- src/couch_mrview/test/01-load.t | 34 - src/couch_mrview/test/02-map-views.t | 131 ---- src/couch_mrview/test/03-red-views.t | 78 -- src/couch_mrview/test/04-index-info.t | 54 -- src/couch_mrview/test/05-collation.t | 163 ----- src/couch_mrview/test/06-all-docs.t | 127 ---- src/couch_mrview/test/07-compact-swap.t | 57 -- .../test/couch_mrview_all_docs_tests.erl | 154 ++++ .../test/couch_mrview_collation_tests.erl | 202 +++++ .../test/couch_mrview_compact_tests.erl | 101 +++ .../test/couch_mrview_index_info_tests.erl | 87 +++ .../test/couch_mrview_map_views_tests.erl | 136 ++++ .../test/couch_mrview_modules_load_tests.erl | 37 + .../test/couch_mrview_red_views_tests.erl | 108 +++ src/couch_replicator/Makefile.am | 16 +- src/couch_replicator/test/01-load.t | 37 - src/couch_replicator/test/02-httpc-pool.t | 250 ------- .../test/03-replication-compact.t | 488 ------------- .../test/04-replication-large-atts.t | 267 ------- .../test/05-replication-many-leaves.t | 294 -------- .../test/06-doc-missing-stubs.t | 304 -------- src/couch_replicator/test/07-use-checkpoints.t | 273 ------- .../test/couch_replicator_compact_tests.erl | 448 ++++++++++++ .../test/couch_replicator_httpc_pool_tests.erl | 189 +++++ .../test/couch_replicator_large_atts_tests.erl | 218 ++++++ .../test/couch_replicator_many_leaves_tests.erl | 232 ++++++ .../couch_replicator_missing_stubs_tests.erl | 260 +++++++ .../couch_replicator_modules_load_tests.erl | 40 + .../couch_replicator_use_checkpoints_tests.erl | 200 +++++ src/couchdb/couch_key_tree.erl | 2 +- src/etap/Makefile.am | 28 - src/etap/etap.erl | 614 ---------------- test/Makefile.am | 2 +- test/couchdb/Makefile.am | 83 +++ test/couchdb/couch_auth_cache_tests.erl | 238 ++++++ test/couchdb/couch_btree_tests.erl | 551 ++++++++++++++ test/couchdb/couch_changes_tests.erl | 612 ++++++++++++++++ test/couchdb/couch_config_tests.erl | 463 ++++++++++++ test/couchdb/couch_db_tests.erl | 114 +++ test/couchdb/couch_doc_json_tests.erl | 391 ++++++++++ test/couchdb/couch_file_tests.erl | 265 +++++++ test/couchdb/couch_key_tree_tests.erl | 380 ++++++++++ test/couchdb/couch_passwords_tests.erl | 54 ++ test/couchdb/couch_ref_counter_tests.erl | 107 +++ test/couchdb/couch_stats_tests.erl | 421 +++++++++++ test/couchdb/couch_stream_tests.erl | 100 +++ test/couchdb/couch_task_status_tests.erl | 225 ++++++ test/couchdb/couch_util_tests.erl | 136 ++++ test/couchdb/couch_uuids_tests.erl | 161 ++++ test/couchdb/couch_work_queue_tests.erl | 393 ++++++++++ test/couchdb/couchdb_attachments_tests.erl | 638 ++++++++++++++++ test/couchdb/couchdb_compaction_daemon.erl | 231 ++++++ test/couchdb/couchdb_cors_tests.erl | 344 +++++++++ test/couchdb/couchdb_file_compression_tests.erl | 239 ++++++ test/couchdb/couchdb_http_proxy_tests.erl | 554 ++++++++++++++ test/couchdb/couchdb_modules_load_tests.erl | 68 ++ test/couchdb/couchdb_os_daemons_tests.erl | 329 +++++++++ test/couchdb/couchdb_os_proc_pool.erl | 179 +++++ test/couchdb/couchdb_update_conflicts_tests.erl | 243 +++++++ test/couchdb/couchdb_vhosts_tests.erl | 441 +++++++++++ test/couchdb/couchdb_views_tests.erl | 677 +++++++++++++++++ test/couchdb/eunit.ini | 28 + .../3b835456c235b1827e012e25666152f3.view | Bin 0 -> 4192 bytes test/couchdb/fixtures/Makefile.am | 15 + test/couchdb/fixtures/couch_config_tests_1.ini | 22 + test/couchdb/fixtures/couch_config_tests_2.ini | 22 + .../couchdb/fixtures/couch_stats_aggregates.cfg | 19 + .../couchdb/fixtures/couch_stats_aggregates.ini | 20 + test/couchdb/fixtures/logo.png | Bin 0 -> 3010 bytes test/couchdb/fixtures/os_daemon_bad_perm.sh | 17 + test/couchdb/fixtures/os_daemon_can_reboot.sh | 15 + .../fixtures/os_daemon_configer.escript.in | 84 +++ test/couchdb/fixtures/os_daemon_die_on_boot.sh | 15 + test/couchdb/fixtures/os_daemon_die_quickly.sh | 15 + test/couchdb/fixtures/os_daemon_looper.escript | 26 + test/couchdb/fixtures/test.couch | Bin 0 -> 16482 bytes test/couchdb/fixtures/test_cfg_register.c | 31 + test/couchdb/include/couch_eunit.hrl.in | 64 ++ test/couchdb/json_stream_parse_tests.erl | 151 ++++ test/couchdb/run.in | 111 +++ test/couchdb/test_request.erl | 75 ++ test/couchdb/test_web.erl | 112 +++ test/etap/001-load.t | 68 -- test/etap/002-icu-driver.t | 33 - test/etap/010-file-basics.t | 113 --- test/etap/011-file-headers.t | 152 ---- test/etap/020-btree-basics.t | 265 ------- test/etap/021-btree-reductions.t | 237 ------ test/etap/030-doc-from-json.t | 236 ------ test/etap/031-doc-to-json.t | 197 ----- test/etap/040-util.t | 80 -- test/etap/041-uuid-gen-id.ini | 20 - test/etap/041-uuid-gen-seq.ini | 19 - test/etap/041-uuid-gen-utc.ini | 19 - test/etap/041-uuid-gen.t | 147 ---- test/etap/042-work-queue.t | 500 ------------- test/etap/043-find-in-binary.t | 68 -- test/etap/050-stream.t | 87 --- test/etap/060-kt-merging.t | 176 ----- test/etap/061-kt-missing-leaves.t | 65 -- test/etap/062-kt-remove-leaves.t | 69 -- test/etap/063-kt-get-leaves.t | 98 --- test/etap/064-kt-counting.t | 46 -- test/etap/065-kt-stemming.t | 42 -- test/etap/070-couch-db.t | 73 -- test/etap/072-cleanup.t | 126 ---- test/etap/073-changes.t | 558 -------------- test/etap/074-doc-update-conflicts.t | 218 ------ test/etap/075-auth-cache.t | 276 ------- test/etap/076-file-compression.t | 186 ----- test/etap/077-couch-db-fast-db-delete-create.t | 61 -- test/etap/080-config-get-set.t | 128 ---- test/etap/081-config-override.1.ini | 22 - test/etap/081-config-override.2.ini | 22 - test/etap/081-config-override.t | 212 ------ test/etap/082-config-register.t | 94 --- test/etap/083-config-no-files.t | 53 -- test/etap/090-task-status.t | 279 ------- test/etap/100-ref-counter.t | 114 --- test/etap/120-stats-collect.t | 150 ---- test/etap/121-stats-aggregates.cfg | 19 - test/etap/121-stats-aggregates.ini | 20 - test/etap/121-stats-aggregates.t | 171 ----- test/etap/130-attachments-md5.t | 248 ------- test/etap/140-attachment-comp.t | 728 ------------------- test/etap/150-invalid-view-seq.t | 183 ----- test/etap/160-vhosts.t | 371 ---------- test/etap/170-os-daemons.es | 26 - test/etap/170-os-daemons.t | 114 --- test/etap/171-os-daemons-config.es | 85 --- test/etap/171-os-daemons-config.t | 74 -- test/etap/172-os-daemon-errors.1.sh | 17 - test/etap/172-os-daemon-errors.2.sh | 15 - test/etap/172-os-daemon-errors.3.sh | 15 - test/etap/172-os-daemon-errors.4.sh | 15 - test/etap/172-os-daemon-errors.t | 126 ---- test/etap/173-os-daemon-cfg-register.t | 116 --- test/etap/180-http-proxy.ini | 20 - test/etap/180-http-proxy.t | 376 ---------- test/etap/190-json-stream-parse.t | 184 ----- test/etap/200-view-group-no-db-leaks.t | 308 -------- test/etap/201-view-group-shutdown.t | 293 -------- test/etap/210-os-proc-pool.t | 163 ----- test/etap/220-compaction-daemon.t | 225 ------ test/etap/230-pbkfd2.t | 38 - test/etap/231-cors.t | 430 ----------- test/etap/250-upgrade-legacy-view-files.t | 168 ----- test/etap/Makefile.am | 109 --- .../3b835456c235b1827e012e25666152f3.view | Bin 4192 -> 0 bytes test/etap/fixtures/test.couch | Bin 16482 -> 0 bytes test/etap/run.tpl | 32 - test/etap/test_cfg_register.c | 31 - test/etap/test_util.erl.in | 94 --- test/etap/test_web.erl | 99 --- 163 files changed, 11935 insertions(+), 13501 deletions(-) ----------------------------------------------------------------------