This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch COUCHDB-3326-clustered-purge-davisp-refactor-3
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to
refs/heads/COUCHDB-3326-clustered-purge-davisp-refactor-3 by this push:
new 6be4dcb Avoid using _test suffix for PSE test suite
6be4dcb is described below
commit 6be4dcb84ca751ede7d9487dce37c4e9da32d0b4
Author: Paul J. Davis <[email protected]>
AuthorDate: Wed May 9 15:23:54 2018 -0500
Avoid using _test suffix for PSE test suite
---
src/couch_db_engine_tests/src/cet_gather.erl | 10 +++++-----
src/couch_db_engine_tests/src/cet_test_attachments.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_compaction.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_fold_changes.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_fold_docs.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_fold_purge_infos.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_get_set_props.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_open_close_delete.erl | 4 ++--
.../src/cet_test_purge_bad_checkpoints.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_purge_docs.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_purge_replication.erl | 6 +++---
src/couch_db_engine_tests/src/cet_test_read_write_docs.erl | 4 ++--
src/couch_db_engine_tests/src/cet_test_ref_counting.erl | 4 ++--
13 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/couch_db_engine_tests/src/cet_gather.erl
b/src/couch_db_engine_tests/src/cet_gather.erl
index 3bd6af0..e3ae4ac 100644
--- a/src/couch_db_engine_tests/src/cet_gather.erl
+++ b/src/couch_db_engine_tests/src/cet_gather.erl
@@ -23,8 +23,8 @@ module(ModName) ->
SetupMod = get_setup_mod(ModName, Exports),
TeardownMod = get_teardown_mod(ModName, Exports),
- SetupTest = get_fun(ModName, setup_test, 0, Exports),
- TeardownTest = get_fun(ModName, teardown_test, 1, Exports),
+ SetupTest = get_fun(ModName, setup_each, 0, Exports),
+ TeardownTest = get_fun(ModName, teardown_each, 1, Exports),
RevTests = lists:foldl(fun({Fun, Arity}, Acc) ->
case {atom_to_list(Fun), Arity} of
@@ -54,14 +54,14 @@ module(ModName) ->
get_setup_mod(ModName, Exports) ->
- case lists:member({setup_mod, 0}, Exports) of
- true -> fun ModName:setup_mod/0;
+ case lists:member({setup_all, 0}, Exports) of
+ true -> fun ModName:setup_all/0;
false -> fun cet_util:setup_mod/0
end.
get_teardown_mod(ModName, Exports) ->
- case lists:member({teardown_mod, 1}, Exports) of
+ case lists:member({teardown_all, 1}, Exports) of
true -> fun ModName:teardown_mod/1;
false -> fun cet_util:teardown_mod/1
end.
diff --git a/src/couch_db_engine_tests/src/cet_test_attachments.erl
b/src/couch_db_engine_tests/src/cet_test_attachments.erl
index 18faecd..512a198 100644
--- a/src/couch_db_engine_tests/src/cet_test_attachments.erl
+++ b/src/couch_db_engine_tests/src/cet_test_attachments.erl
@@ -19,12 +19,12 @@
-include_lib("couch/include/couch_db.hrl").
-setup_test() ->
+setup_each() ->
{ok, Db} = cet_util:create_db(),
Db.
-teardown_test(Db) ->
+teardown_each(Db) ->
ok = couch_server:delete(couch_db:name(Db), []).
diff --git a/src/couch_db_engine_tests/src/cet_test_compaction.erl
b/src/couch_db_engine_tests/src/cet_test_compaction.erl
index 94c3272..b037cfa 100644
--- a/src/couch_db_engine_tests/src/cet_test_compaction.erl
+++ b/src/couch_db_engine_tests/src/cet_test_compaction.erl
@@ -19,12 +19,12 @@
-include_lib("couch/include/couch_db.hrl").
-setup_test() ->
+setup_each() ->
{ok, Db} = cet_util:create_db(),
Db.
-teardown_test(Db) ->
+teardown_each(Db) ->
ok = couch_server:delete(couch_db:name(Db), []).
diff --git a/src/couch_db_engine_tests/src/cet_test_fold_changes.erl
b/src/couch_db_engine_tests/src/cet_test_fold_changes.erl
index 061a5e3..bacb446 100644
--- a/src/couch_db_engine_tests/src/cet_test_fold_changes.erl
+++ b/src/couch_db_engine_tests/src/cet_test_fold_changes.erl
@@ -22,12 +22,12 @@
-define(NUM_DOCS, 25).
-setup_test() ->
+setup_each() ->
{ok, Db} = cet_util:create_db(),
Db.
-teardown_test(Db) ->
+teardown_each(Db) ->
ok = couch_server:delete(couch_db:name(Db), []).
diff --git a/src/couch_db_engine_tests/src/cet_test_fold_docs.erl
b/src/couch_db_engine_tests/src/cet_test_fold_docs.erl
index 9698ace..303d314 100644
--- a/src/couch_db_engine_tests/src/cet_test_fold_docs.erl
+++ b/src/couch_db_engine_tests/src/cet_test_fold_docs.erl
@@ -22,11 +22,11 @@
-define(NUM_DOCS, 100).
-setup_test() ->
+setup_each() ->
cet_util:dbname().
-teardown_test(DbName) ->
+teardown_each(DbName) ->
ok = couch_server:delete(DbName, []).
diff --git a/src/couch_db_engine_tests/src/cet_test_fold_purge_infos.erl
b/src/couch_db_engine_tests/src/cet_test_fold_purge_infos.erl
index 2f8d1de..7908ce8 100644
--- a/src/couch_db_engine_tests/src/cet_test_fold_purge_infos.erl
+++ b/src/couch_db_engine_tests/src/cet_test_fold_purge_infos.erl
@@ -22,12 +22,12 @@
-define(NUM_DOCS, 100).
-setup_test() ->
+setup_each() ->
{ok, Db} = cet_util:create_db(),
Db.
-teardown_test(Db) ->
+teardown_each(Db) ->
ok = couch_server:delete(couch_db:name(Db), []).
diff --git a/src/couch_db_engine_tests/src/cet_test_get_set_props.erl
b/src/couch_db_engine_tests/src/cet_test_get_set_props.erl
index 310469b..d3aa3a9 100644
--- a/src/couch_db_engine_tests/src/cet_test_get_set_props.erl
+++ b/src/couch_db_engine_tests/src/cet_test_get_set_props.erl
@@ -18,11 +18,11 @@
-include_lib("eunit/include/eunit.hrl").
-setup_test() ->
+setup_each() ->
cet_util:dbname().
-teardown_test(DbName) ->
+teardown_each(DbName) ->
ok = couch_server:delete(DbName, []).
diff --git a/src/couch_db_engine_tests/src/cet_test_open_close_delete.erl
b/src/couch_db_engine_tests/src/cet_test_open_close_delete.erl
index b37f65c..5c7f7ec 100644
--- a/src/couch_db_engine_tests/src/cet_test_open_close_delete.erl
+++ b/src/couch_db_engine_tests/src/cet_test_open_close_delete.erl
@@ -18,11 +18,11 @@
-include_lib("eunit/include/eunit.hrl").
-setup_test() ->
+setup_each() ->
cet_util:dbname().
-teardown_test(DbName) ->
+teardown_each(DbName) ->
case couch_server:exists(DbName) of
true -> ok = couch_server:delete(DbName, []);
false -> ok
diff --git a/src/couch_db_engine_tests/src/cet_test_purge_bad_checkpoints.erl
b/src/couch_db_engine_tests/src/cet_test_purge_bad_checkpoints.erl
index 2d53f61..626bbeb 100644
--- a/src/couch_db_engine_tests/src/cet_test_purge_bad_checkpoints.erl
+++ b/src/couch_db_engine_tests/src/cet_test_purge_bad_checkpoints.erl
@@ -19,7 +19,7 @@
-include_lib("couch/include/couch_db.hrl").
-setup_test() ->
+setup_each() ->
{ok, Db1} = cet_util:create_db(),
{ok, Revs} = cet_util:save_docs(couch_db:name(Db1), [
{[{'_id', foo0}, {vsn, 0}]},
@@ -43,7 +43,7 @@ setup_test() ->
Db2.
-teardown_test(Db) ->
+teardown_each(Db) ->
ok = couch_server:delete(couch_db:name(Db), []).
diff --git a/src/couch_db_engine_tests/src/cet_test_purge_docs.erl
b/src/couch_db_engine_tests/src/cet_test_purge_docs.erl
index 84157be..e4571bc 100644
--- a/src/couch_db_engine_tests/src/cet_test_purge_docs.erl
+++ b/src/couch_db_engine_tests/src/cet_test_purge_docs.erl
@@ -22,12 +22,12 @@
-define(REV_DEPTH, 100).
-setup_test() ->
+setup_each() ->
{ok, Db} = cet_util:create_db(),
couch_db:name(Db).
-teardown_test(DbName) ->
+teardown_each(DbName) ->
ok = couch_server:delete(DbName, []).
diff --git a/src/couch_db_engine_tests/src/cet_test_purge_replication.erl
b/src/couch_db_engine_tests/src/cet_test_purge_replication.erl
index e520a2e..09d28ee 100644
--- a/src/couch_db_engine_tests/src/cet_test_purge_replication.erl
+++ b/src/couch_db_engine_tests/src/cet_test_purge_replication.erl
@@ -20,17 +20,17 @@
-include_lib("mem3/include/mem3.hrl").
-setup_mod() ->
+setup_all() ->
cet_util:setup_mod([mem3, fabric, couch_replicator]).
-setup_test() ->
+setup_each() ->
{ok, Src} = cet_util:create_db(),
{ok, Tgt} = cet_util:create_db(),
{couch_db:name(Src), couch_db:name(Tgt)}.
-teardown_test({SrcDb, TgtDb}) ->
+teardown_each({SrcDb, TgtDb}) ->
ok = couch_server:delete(SrcDb, []),
ok = couch_server:delete(TgtDb, []).
diff --git a/src/couch_db_engine_tests/src/cet_test_read_write_docs.erl
b/src/couch_db_engine_tests/src/cet_test_read_write_docs.erl
index 261de08..ed4d347 100644
--- a/src/couch_db_engine_tests/src/cet_test_read_write_docs.erl
+++ b/src/couch_db_engine_tests/src/cet_test_read_write_docs.erl
@@ -19,12 +19,12 @@
-include_lib("couch/include/couch_db.hrl").
-setup_test() ->
+setup_each() ->
{ok, Db} = cet_util:create_db(),
Db.
-teardown_test(Db) ->
+teardown_each(Db) ->
ok = couch_server:delete(couch_db:name(Db), []).
diff --git a/src/couch_db_engine_tests/src/cet_test_ref_counting.erl
b/src/couch_db_engine_tests/src/cet_test_ref_counting.erl
index 2288218..75fc9fa 100644
--- a/src/couch_db_engine_tests/src/cet_test_ref_counting.erl
+++ b/src/couch_db_engine_tests/src/cet_test_ref_counting.erl
@@ -22,12 +22,12 @@
-define(NUM_CLIENTS, 1000).
-setup_test() ->
+setup_each() ->
{ok, Db} = cet_util:create_db(),
{Db, self()}.
-teardown_test({Db, _}) ->
+teardown_each({Db, _}) ->
ok = couch_server:delete(couch_db:name(Db), []).
--
To stop receiving notification emails like this one, please contact
[email protected].
