You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2022/09/28 18:21:41 UTC
[couchdb] 01/01: Clean up unit tests
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch cleanup-fabric-tests
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 0434cb463c002dc9440579f938180014cc3f6fdf
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Wed Sep 28 14:18:42 2022 -0400
Clean up unit tests
* Centralize the definition of TDEF* macros
* Don't include eunit bits in the fabric at the top, instead use TEST specific
sections
* Remove some unused include files, as reported by erlang_ls + emacs
---
.../eunit/chttpd_auth_hash_algorithms_tests.erl | 1 -
src/chttpd/test/eunit/chttpd_csp_tests.erl | 6 ----
src/chttpd/test/eunit/chttpd_dbs_info_test.erl | 1 -
src/chttpd/test/eunit/chttpd_revs_diff_tests.erl | 2 --
src/chttpd/test/eunit/chttpd_session_tests.erl | 1 -
src/chttpd/test/eunit/chttpd_test.hrl | 35 ----------------------
src/chttpd/test/eunit/chttpd_util_test.erl | 1 -
src/couch/include/couch_eunit.hrl | 24 +++++++++++++++
src/couch/src/test_util.erl | 10 +++----
src/couch/test/eunit/couch_flags_tests.erl | 4 +--
.../test/eunit/couchdb_open_doc_revs_tests.erl | 2 --
src/couch/test/eunit/test_web.erl | 4 +--
.../src/couch_replicator_share.erl | 1 -
.../couch_replicator_attachments_too_large.erl | 1 -
.../test/eunit/couch_replicator_bulk_get_tests.erl | 1 -
.../test/eunit/couch_replicator_compact_tests.erl | 1 -
.../eunit/couch_replicator_connection_tests.erl | 1 -
...replicator_create_target_with_options_tests.erl | 1 -
.../couch_replicator_error_reporting_tests.erl | 1 -
.../test/eunit/couch_replicator_filtered_tests.erl | 1 -
.../eunit/couch_replicator_httpc_pool_tests.erl | 1 -
.../eunit/couch_replicator_id_too_long_tests.erl | 1 -
.../eunit/couch_replicator_large_atts_tests.erl | 1 -
.../eunit/couch_replicator_many_leaves_tests.erl | 1 -
.../eunit/couch_replicator_missing_stubs_tests.erl | 1 -
.../eunit/couch_replicator_rate_limiter_tests.erl | 1 -
...ch_replicator_retain_stats_between_job_runs.erl | 1 -
.../eunit/couch_replicator_revs_diff_tests.erl | 1 -
.../test/eunit/couch_replicator_selector_tests.erl | 1 -
...ch_replicator_small_max_request_size_target.erl | 1 -
.../test/eunit/couch_replicator_test.hrl | 35 ----------------------
.../couch_replicator_use_checkpoints_tests.erl | 1 -
src/fabric/include/fabric.hrl | 2 --
src/fabric/src/fabric_doc_open_revs.erl | 4 +--
src/fabric/src/fabric_ring.erl | 6 +++-
src/fabric/src/fabric_view.erl | 6 ++++
src/mem3/test/eunit/mem3_distribution_test.erl | 1 -
37 files changed, 45 insertions(+), 119 deletions(-)
diff --git a/src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl b/src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl
index c78427d24..52f4f9e8b 100644
--- a/src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl
+++ b/src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl
@@ -14,7 +14,6 @@
-include_lib("eunit/include/eunit.hrl").
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include_lib("chttpd/test/eunit/chttpd_test.hrl").
-define(ADM_USER, "adm_user").
-define(ADM_PASS, "adm_pass").
diff --git a/src/chttpd/test/eunit/chttpd_csp_tests.erl b/src/chttpd/test/eunit/chttpd_csp_tests.erl
index c4a9e930e..09a06da04 100644
--- a/src/chttpd/test/eunit/chttpd_csp_tests.erl
+++ b/src/chttpd/test/eunit/chttpd_csp_tests.erl
@@ -31,12 +31,6 @@
-define(SHOW1, "show1").
-define(LIST1, "list1").
-define(SALT, <<"01234567890123456789012345678901">>).
--define(TDEF(Name), {atom_to_list(Name), fun Name/1}).
--define(TDEF(Name, Timeout), {atom_to_list(Name), Timeout, fun Name/1}).
--define(TDEF_FE(Name), fun(Arg) -> {atom_to_list(Name), ?_test(Name(Arg))} end).
--define(TDEF_FE(Name, Timeout), fun(Arg) ->
- {atom_to_list(Name), {timeout, Timeout, ?_test(Name(Arg))}}
-end).
csp_test_() ->
{
diff --git a/src/chttpd/test/eunit/chttpd_dbs_info_test.erl b/src/chttpd/test/eunit/chttpd_dbs_info_test.erl
index cb386d63f..ee4b2687f 100644
--- a/src/chttpd/test/eunit/chttpd_dbs_info_test.erl
+++ b/src/chttpd/test/eunit/chttpd_dbs_info_test.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("chttpd_test.hrl").
-define(USER, "chttpd_db_test_admin").
-define(PASS, "pass").
diff --git a/src/chttpd/test/eunit/chttpd_revs_diff_tests.erl b/src/chttpd/test/eunit/chttpd_revs_diff_tests.erl
index 7cdb81fa2..910c541cc 100644
--- a/src/chttpd/test/eunit/chttpd_revs_diff_tests.erl
+++ b/src/chttpd/test/eunit/chttpd_revs_diff_tests.erl
@@ -15,8 +15,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--define(TDEF_FE(Name), fun(Arg) -> {atom_to_list(Name), ?_test(Name(Arg))} end).
-
-define(USER, "chttpd_revs_diff_test_admin").
-define(PASS, "pass").
-define(AUTH, {basic_auth, {?USER, ?PASS}}).
diff --git a/src/chttpd/test/eunit/chttpd_session_tests.erl b/src/chttpd/test/eunit/chttpd_session_tests.erl
index e00406fe1..0707090b0 100644
--- a/src/chttpd/test/eunit/chttpd_session_tests.erl
+++ b/src/chttpd/test/eunit/chttpd_session_tests.erl
@@ -13,7 +13,6 @@
-module(chttpd_session_tests).
-include_lib("couch/include/couch_eunit.hrl").
--include("chttpd_test.hrl").
-define(USER, "chttpd_test_admin").
-define(PASS, "pass").
diff --git a/src/chttpd/test/eunit/chttpd_test.hrl b/src/chttpd/test/eunit/chttpd_test.hrl
deleted file mode 100644
index 6db97ec2b..000000000
--- a/src/chttpd/test/eunit/chttpd_test.hrl
+++ /dev/null
@@ -1,35 +0,0 @@
-% 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.
-
-
-% Borrowed from fabric2_test.hrl
-
-% Some test modules do not use with, so squash the unused fun compiler warning
--compile([{nowarn_unused_function, [{with, 1}]}]).
-
-
--define(TDEF(Name), {atom_to_list(Name), fun Name/1}).
--define(TDEF(Name, Timeout), {atom_to_list(Name), Timeout, fun Name/1}).
-
--define(TDEF_FE(Name), fun(Arg) -> {atom_to_list(Name), ?_test(Name(Arg))} end).
--define(TDEF_FE(Name, Timeout), fun(Arg) -> {atom_to_list(Name), {timeout, Timeout, ?_test(Name(Arg))}} end).
-
-
-with(Tests) ->
- fun(ArgsTuple) ->
- lists:map(fun
- ({Name, Fun}) ->
- {Name, ?_test(Fun(ArgsTuple))};
- ({Name, Timeout, Fun}) ->
- {Name, {timeout, Timeout, ?_test(Fun(ArgsTuple))}}
- end, Tests)
- end.
diff --git a/src/chttpd/test/eunit/chttpd_util_test.erl b/src/chttpd/test/eunit/chttpd_util_test.erl
index 69fb60156..c381dac6e 100644
--- a/src/chttpd/test/eunit/chttpd_util_test.erl
+++ b/src/chttpd/test/eunit/chttpd_util_test.erl
@@ -13,7 +13,6 @@
-module(chttpd_util_test).
-include_lib("couch/include/couch_eunit.hrl").
--include("chttpd_test.hrl").
setup() ->
ok = lists:foreach(
diff --git a/src/couch/include/couch_eunit.hrl b/src/couch/include/couch_eunit.hrl
index 188524893..3ffa0506f 100644
--- a/src/couch/include/couch_eunit.hrl
+++ b/src/couch/include/couch_eunit.hrl
@@ -12,6 +12,9 @@
-include_lib("eunit/include/eunit.hrl").
+% Some test modules do not use with, so squash the unused fun compiler warning
+-compile([{nowarn_unused_function, [{with, 1}]}]).
+
-define(BUILDDIR,
fun() ->
case os:getenv("BUILDDIR") of
@@ -75,3 +78,24 @@
end)(Expect))).
-endif.
-define(_assertEquiv(Expect, Expr), ?_test(?assertEquiv(Expect, Expr))).
+
+
+-ifndef(TDEF).
+-define(TDEF(Name), {atom_to_list(Name), fun Name/1}).
+-define(TDEF(Name, Timeout), {atom_to_list(Name), Timeout, fun Name/1}).
+-endif.
+
+-ifndef(TDEF_FE).
+-define(TDEF_FE(Name), fun(Arg) -> {atom_to_list(Name), ?_test(Name(Arg))} end).
+-define(TDEF_FE(Name, Timeout), fun(Arg) -> {atom_to_list(Name), {timeout, Timeout, ?_test(Name(Arg))}} end).
+-endif.
+
+with(Tests) ->
+ fun(ArgsTuple) ->
+ lists:map(fun
+ ({Name, Fun}) ->
+ {Name, ?_test(Fun(ArgsTuple))};
+ ({Name, Timeout, Fun}) ->
+ {Name, {timeout, Timeout, ?_test(Fun(ArgsTuple))}}
+ end, Tests)
+ end.
diff --git a/src/couch/src/test_util.erl b/src/couch/src/test_util.erl
index 165a5be2f..345359794 100644
--- a/src/couch/src/test_util.erl
+++ b/src/couch/src/test_util.erl
@@ -12,11 +12,6 @@
-module(test_util).
--include_lib("couch/include/couch_eunit.hrl").
--include_lib("couch/include/couch_db.hrl").
--include("couch_db_int.hrl").
--include("couch_bt_engine.hrl").
-
-export([init_code_path/0]).
-export([source_file/1, build_file/1]).
-export([revtree_generate/4, revtree_get_revs/1, random_rev/0]).
@@ -42,6 +37,11 @@
-export([shuffle/1]).
+-include_lib("couch/include/couch_eunit.hrl").
+-include_lib("couch/include/couch_db.hrl").
+-include("couch_db_int.hrl").
+-include("couch_bt_engine.hrl").
+
-record(test_context, {mocked = [], started = [], module}).
-define(DEFAULT_APPS, [inets, ibrowse, ssl, config, couch_epi, couch_event, couch]).
diff --git a/src/couch/test/eunit/couch_flags_tests.erl b/src/couch/test/eunit/couch_flags_tests.erl
index e3635e9f2..57775eac4 100644
--- a/src/couch/test/eunit/couch_flags_tests.erl
+++ b/src/couch/test/eunit/couch_flags_tests.erl
@@ -12,8 +12,6 @@
-module(couch_flags_tests).
--include_lib("couch/include/couch_eunit.hrl").
-
%% couch_epi_plugin behaviour callbacks
-export([
app/0,
@@ -29,6 +27,8 @@
rules/0
]).
+-include_lib("couch/include/couch_eunit.hrl").
+
app() ->
test_app.
diff --git a/src/couch/test/eunit/couchdb_open_doc_revs_tests.erl b/src/couch/test/eunit/couchdb_open_doc_revs_tests.erl
index 78d9c3182..07209cd73 100644
--- a/src/couch/test/eunit/couchdb_open_doc_revs_tests.erl
+++ b/src/couch/test/eunit/couchdb_open_doc_revs_tests.erl
@@ -15,8 +15,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--define(TDEF_FE(Name), fun(Arg) -> {atom_to_list(Name), ?_test(Name(Arg))} end).
-
open_doc_revs_test_() ->
{
foreach,
diff --git a/src/couch/test/eunit/test_web.erl b/src/couch/test/eunit/test_web.erl
index 8998dad52..25fe7092b 100644
--- a/src/couch/test/eunit/test_web.erl
+++ b/src/couch/test/eunit/test_web.erl
@@ -15,12 +15,12 @@
-compile(tuple_calls).
--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]).
-export([handle_call/3, handle_cast/2, handle_info/2]).
+-include_lib("couch/include/couch_eunit.hrl").
+
-define(SERVER, test_web_server).
-define(HANDLER, test_web_handler).
-define(DELAY, 500).
diff --git a/src/couch_replicator/src/couch_replicator_share.erl b/src/couch_replicator/src/couch_replicator_share.erl
index 8c9fa029a..fb7b2fcfc 100644
--- a/src/couch_replicator/src/couch_replicator_share.erl
+++ b/src/couch_replicator/src/couch_replicator_share.erl
@@ -333,7 +333,6 @@ float_val(Str, Default) when is_list(Str) ->
-include_lib("eunit/include/eunit.hrl").
-include_lib("couch/include/couch_eunit.hrl").
--include_lib("couch_replicator/test/eunit/couch_replicator_test.hrl").
-define(DB1, <<"db1">>).
-define(DB2, <<"db2">>).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_attachments_too_large.erl b/src/couch_replicator/test/eunit/couch_replicator_attachments_too_large.erl
index 4c4ff9c14..0b4360378 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_attachments_too_large.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_attachments_too_large.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
attachment_too_large_replication_test_() ->
{
diff --git a/src/couch_replicator/test/eunit/couch_replicator_bulk_get_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_bulk_get_tests.erl
index 52c623c85..2ecd0f4ee 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_bulk_get_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_bulk_get_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
-define(DOC_COUNT, 10).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_compact_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_compact_tests.erl
index 373bd02ba..2d5ef96b1 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_compact_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_compact_tests.erl
@@ -15,7 +15,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_replicator/src/couch_replicator.hrl").
--include("couch_replicator_test.hrl").
-define(ATTFILE, filename:join([?FIXTURESDIR, "logo.png"])).
-define(DELAY, 500).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_connection_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_connection_tests.erl
index e8c90d02a..aa75bd746 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_connection_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_connection_tests.erl
@@ -13,7 +13,6 @@
-module(couch_replicator_connection_tests).
-include_lib("couch/include/couch_eunit.hrl").
--include("couch_replicator_test.hrl").
setup() ->
Host = config:get("httpd", "bind_address", "127.0.0.1"),
diff --git a/src/couch_replicator/test/eunit/couch_replicator_create_target_with_options_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_create_target_with_options_tests.erl
index fabb6480e..b6e361c8f 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_create_target_with_options_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_create_target_with_options_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
create_target_with_options_replication_test_() ->
{
diff --git a/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
index 3f454b002..6bdb4ecb2 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
@@ -15,7 +15,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_replicator/src/couch_replicator.hrl").
--include("couch_replicator_test.hrl").
error_reporting_test_() ->
{
diff --git a/src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl
index 267c4fab6..d99062b2b 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
-define(DDOC,
{[
diff --git a/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl
index 5fce5e886..512d02037 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl
@@ -13,7 +13,6 @@
-module(couch_replicator_httpc_pool_tests).
-include_lib("couch/include/couch_eunit.hrl").
--include("couch_replicator_test.hrl").
-define(TIMEOUT, 1000).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_id_too_long_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_id_too_long_tests.erl
index 08454bd71..4d2095768 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_id_too_long_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_id_too_long_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
id_too_long_replication_test_() ->
{
diff --git a/src/couch_replicator/test/eunit/couch_replicator_large_atts_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_large_atts_tests.erl
index 8190c7205..e60e3be5d 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_large_atts_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_large_atts_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
-define(ATT_SIZE_1, 2 * 1024 * 1024).
-define(ATT_SIZE_2, round(6.6 * 1024 * 1024)).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_many_leaves_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_many_leaves_tests.erl
index aa5752650..2ede0d47e 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_many_leaves_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_many_leaves_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
-define(DOCS_CONFLICTS, [
{<<"doc1">>, 10},
diff --git a/src/couch_replicator/test/eunit/couch_replicator_missing_stubs_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_missing_stubs_tests.erl
index b0e205729..551de3f4c 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_missing_stubs_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_missing_stubs_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
-define(REVS_LIMIT, 3).
-define(TIMEOUT_EUNIT, 30).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_rate_limiter_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_rate_limiter_tests.erl
index 0b7c48b62..acb931b9b 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_rate_limiter_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_rate_limiter_tests.erl
@@ -1,7 +1,6 @@
-module(couch_replicator_rate_limiter_tests).
-include_lib("couch/include/couch_eunit.hrl").
--include("couch_replicator_test.hrl").
rate_limiter_test_() ->
{
diff --git a/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl b/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
index d1116e8b0..04c665af5 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
@@ -15,7 +15,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_replicator/src/couch_replicator.hrl").
--include("couch_replicator_test.hrl").
-define(DELAY, 500).
-define(TIMEOUT, 60000).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_revs_diff_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_revs_diff_tests.erl
index 75f01b20a..ccdfb506c 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_revs_diff_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_revs_diff_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
-define(DOC_COUNT, 100).
-define(BATCH_SIZE, 5).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_selector_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_selector_tests.erl
index 31c5dc93c..d5566a38f 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_selector_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_selector_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
selector_replication_test_() ->
{
diff --git a/src/couch_replicator/test/eunit/couch_replicator_small_max_request_size_target.erl b/src/couch_replicator/test/eunit/couch_replicator_small_max_request_size_target.erl
index 4a905850d..c7e89e8be 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_small_max_request_size_target.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_small_max_request_size_target.erl
@@ -2,7 +2,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
-define(TIMEOUT_EUNIT, 360).
diff --git a/src/couch_replicator/test/eunit/couch_replicator_test.hrl b/src/couch_replicator/test/eunit/couch_replicator_test.hrl
deleted file mode 100644
index 6db97ec2b..000000000
--- a/src/couch_replicator/test/eunit/couch_replicator_test.hrl
+++ /dev/null
@@ -1,35 +0,0 @@
-% 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.
-
-
-% Borrowed from fabric2_test.hrl
-
-% Some test modules do not use with, so squash the unused fun compiler warning
--compile([{nowarn_unused_function, [{with, 1}]}]).
-
-
--define(TDEF(Name), {atom_to_list(Name), fun Name/1}).
--define(TDEF(Name, Timeout), {atom_to_list(Name), Timeout, fun Name/1}).
-
--define(TDEF_FE(Name), fun(Arg) -> {atom_to_list(Name), ?_test(Name(Arg))} end).
--define(TDEF_FE(Name, Timeout), fun(Arg) -> {atom_to_list(Name), {timeout, Timeout, ?_test(Name(Arg))}} end).
-
-
-with(Tests) ->
- fun(ArgsTuple) ->
- lists:map(fun
- ({Name, Fun}) ->
- {Name, ?_test(Fun(ArgsTuple))};
- ({Name, Timeout, Fun}) ->
- {Name, {timeout, Timeout, ?_test(Fun(ArgsTuple))}}
- end, Tests)
- end.
diff --git a/src/couch_replicator/test/eunit/couch_replicator_use_checkpoints_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_use_checkpoints_tests.erl
index 193855a3d..9d6dd1ec0 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_use_checkpoints_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_use_checkpoints_tests.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
--include("couch_replicator_test.hrl").
-define(DOCS_COUNT, 100).
-define(TIMEOUT_EUNIT, 30).
diff --git a/src/fabric/include/fabric.hrl b/src/fabric/include/fabric.hrl
index 2a4da8bcf..0c6ac5df8 100644
--- a/src/fabric/include/fabric.hrl
+++ b/src/fabric/include/fabric.hrl
@@ -10,8 +10,6 @@
% License for the specific language governing permissions and limitations under
% the License.
--include_lib("eunit/include/eunit.hrl").
-
-record(collector, {
db_name=nil,
query_args,
diff --git a/src/fabric/src/fabric_doc_open_revs.erl b/src/fabric/src/fabric_doc_open_revs.erl
index a5ff871e7..71188dd51 100644
--- a/src/fabric/src/fabric_doc_open_revs.erl
+++ b/src/fabric/src/fabric_doc_open_revs.erl
@@ -14,10 +14,8 @@
-export([go/4]).
--include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
--include_lib("eunit/include/eunit.hrl").
-record(state, {
dbname,
@@ -317,7 +315,7 @@ collapse_duplicate_revs_int([Reply | Rest]) ->
[Reply | collapse_duplicate_revs(Rest)].
-ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
+-include_lib("couch/include/couch_eunit.hrl").
setup_all() ->
config:start_link([]),
diff --git a/src/fabric/src/fabric_ring.erl b/src/fabric/src/fabric_ring.erl
index 2bb7d717f..9349efb90 100644
--- a/src/fabric/src/fabric_ring.erl
+++ b/src/fabric/src/fabric_ring.erl
@@ -271,7 +271,9 @@ stop_unused_workers(Workers, AllResponses, UsedResponses, CleanupCb) ->
stop_workers(Shards) when is_list(Shards) ->
rexi:kill_all([{Node, Ref} || #shard{node = Node, ref = Ref} <- Shards]).
-% Unit tests
+-ifdef(TEST).
+
+-include_lib("couch/include/couch_eunit.hrl").
is_progress_possible_full_range_test() ->
% a base case
@@ -558,3 +560,5 @@ mk_shard(Name, Range) ->
Node = list_to_atom(Name),
BName = list_to_binary(Name),
#shard{name = BName, node = Node, range = Range}.
+
+-endif.
diff --git a/src/fabric/src/fabric_view.erl b/src/fabric/src/fabric_view.erl
index c2ef13392..82f9c2bc6 100644
--- a/src/fabric/src/fabric_view.erl
+++ b/src/fabric/src/fabric_view.erl
@@ -480,6 +480,10 @@ fix_skip_and_limit(#mrargs{} = Args) ->
remove_finalizer(Args) ->
couch_mrview_util:set_extra(Args, finalizer, null).
+-ifdef(TEST).
+
+-include_lib("couch/include/couch_eunit.hrl").
+
remove_overlapping_shards_test() ->
Cb = undefined,
@@ -559,3 +563,5 @@ mk_shard(Name, Range) ->
Node = list_to_atom(Name),
BName = list_to_binary(Name),
#shard{name = BName, node = Node, range = Range}.
+
+-endif.
diff --git a/src/mem3/test/eunit/mem3_distribution_test.erl b/src/mem3/test/eunit/mem3_distribution_test.erl
index d442a47b3..6182ace71 100644
--- a/src/mem3/test/eunit/mem3_distribution_test.erl
+++ b/src/mem3/test/eunit/mem3_distribution_test.erl
@@ -14,7 +14,6 @@
-include_lib("couch/include/couch_eunit.hrl").
--define(TDEF_FE(Name), fun(Arg) -> {atom_to_list(Name), ?_test(Name(Arg))} end).
-define(MOD, mem3_distribution).
setup() ->