You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ji...@apache.org on 2018/06/28 09:33:41 UTC
[couchdb] branch COUCHDB-3326-clustered-purge-pr5-implementation
updated: Add LINE and Module to assert_db_prop
This is an automated email from the ASF dual-hosted git repository.
jiangphcn pushed a commit to branch COUCHDB-3326-clustered-purge-pr5-implementation
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/COUCHDB-3326-clustered-purge-pr5-implementation by this push:
new 8a62f68 Add LINE and Module to assert_db_prop
8a62f68 is described below
commit 8a62f686e806d5726ec19e625ae06c714bc7106a
Author: jiangphcn <ji...@cn.ibm.com>
AuthorDate: Thu Jun 28 17:32:43 2018 +0800
Add LINE and Module to assert_db_prop
COUCHDB-3326
---
src/couch_pse_tests/src/cpse_test_purge_docs.erl | 46 +++++++++++-----------
.../src/cpse_test_purge_replication.erl | 10 ++---
src/couch_pse_tests/src/cpse_test_purge_seqs.erl | 14 +++----
src/couch_pse_tests/src/cpse_util.erl | 16 ++++++--
4 files changed, 47 insertions(+), 39 deletions(-)
diff --git a/src/couch_pse_tests/src/cpse_test_purge_docs.erl b/src/couch_pse_tests/src/cpse_test_purge_docs.erl
index bebd234..3378825 100644
--- a/src/couch_pse_tests/src/cpse_test_purge_docs.erl
+++ b/src/couch_pse_tests/src/cpse_test_purge_docs.erl
@@ -39,7 +39,7 @@ cpse_purge_simple(DbName) ->
{update_seq, 1},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos = [
{cpse_util:uuid(), <<"foo1">>, [Rev]}
@@ -54,7 +54,7 @@ cpse_purge_simple(DbName) ->
{update_seq, 2},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_simple_info_check(DbName) ->
@@ -87,7 +87,7 @@ cpse_purge_empty_db(DbName) ->
{changes, 0},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_single_docid(DbName) ->
@@ -103,7 +103,7 @@ cpse_purge_single_docid(DbName) ->
{changes, 2},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos = [
{cpse_util:uuid(), <<"foo1">>, [Rev1]}
@@ -118,7 +118,7 @@ cpse_purge_single_docid(DbName) ->
{changes, 1},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_multiple_docids(DbName) ->
@@ -134,7 +134,7 @@ cpse_purge_multiple_docids(DbName) ->
{changes, 2},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos = [
{cpse_util:uuid(), <<"foo1">>, [Rev1]},
@@ -153,7 +153,7 @@ cpse_purge_multiple_docids(DbName) ->
{changes, 0},
{purge_seq, 2},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_no_docids(DbName) ->
@@ -169,7 +169,7 @@ cpse_purge_no_docids(DbName) ->
{changes, 2},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
{ok, []} = cpse_util:purge(DbName, []),
@@ -180,7 +180,7 @@ cpse_purge_no_docids(DbName) ->
{changes, 2},
{purge_seq, 0},
{purge_infos, []}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_rev_path(DbName) ->
@@ -200,7 +200,7 @@ cpse_purge_rev_path(DbName) ->
{changes, 1},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos = [
{cpse_util:uuid(), <<"foo">>, [Rev2]}
@@ -216,7 +216,7 @@ cpse_purge_rev_path(DbName) ->
{changes, 0},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_deep_revision_path(DbName) ->
@@ -245,7 +245,7 @@ cpse_purge_deep_revision_path(DbName) ->
{changes, 0},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_partial_revs(DbName) ->
@@ -271,7 +271,7 @@ cpse_purge_partial_revs(DbName) ->
{changes, 1},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_missing_docid(DbName) ->
@@ -287,7 +287,7 @@ cpse_purge_missing_docid(DbName) ->
{changes, 2},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos = [
{cpse_util:uuid(), <<"baz">>, [Rev1]}
@@ -302,7 +302,7 @@ cpse_purge_missing_docid(DbName) ->
{changes, 2},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_duplicate_docids(DbName) ->
@@ -318,7 +318,7 @@ cpse_purge_duplicate_docids(DbName) ->
{purge_seq, 0},
{changes, 2},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos = [
{cpse_util:uuid(), <<"foo1">>, [Rev1]},
@@ -335,7 +335,7 @@ cpse_purge_duplicate_docids(DbName) ->
{purge_seq, 2},
{changes, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_internal_revision(DbName) ->
@@ -361,7 +361,7 @@ cpse_purge_internal_revision(DbName) ->
{changes, 1},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_missing_revision(DbName) ->
@@ -384,7 +384,7 @@ cpse_purge_missing_revision(DbName) ->
{changes, 2},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_repeated_revisions(DbName) ->
@@ -403,7 +403,7 @@ cpse_purge_repeated_revisions(DbName) ->
{changes, 1},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos1 = [
{cpse_util:uuid(), <<"foo">>, [Rev1]},
@@ -421,7 +421,7 @@ cpse_purge_repeated_revisions(DbName) ->
{changes, 0},
{purge_seq, 2},
{purge_infos, PurgeInfos1}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_repeated_uuid(DbName) ->
@@ -434,7 +434,7 @@ cpse_purge_repeated_uuid(DbName) ->
{changes, 1},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos = [
{cpse_util:uuid(), <<"foo1">>, [Rev]}
@@ -456,7 +456,7 @@ cpse_purge_repeated_uuid(DbName) ->
{changes, 0},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
fold_all_infos(Info, Acc) ->
diff --git a/src/couch_pse_tests/src/cpse_test_purge_replication.erl b/src/couch_pse_tests/src/cpse_test_purge_replication.erl
index 474d4e6..1c936b8 100644
--- a/src/couch_pse_tests/src/cpse_test_purge_replication.erl
+++ b/src/couch_pse_tests/src/cpse_test_purge_replication.erl
@@ -45,7 +45,7 @@ cpse_purge_http_replication({Source, Target}) ->
{changes, 1},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
RepObject = {[
{<<"source">>, Source},
@@ -62,7 +62,7 @@ cpse_purge_http_replication({Source, Target}) ->
{changes, 1},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos = [
{cpse_util:uuid(), <<"foo">>, [Rev1]}
@@ -78,7 +78,7 @@ cpse_purge_http_replication({Source, Target}) ->
{changes, 0},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]),
+ ], ?MODULE, ?LINE),
% Show that a purge on the source is
% not replicated to the target
@@ -95,7 +95,7 @@ cpse_purge_http_replication({Source, Target}) ->
{changes, 1},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
% Show that replicating from the target
% back to the source reintroduces the doc
@@ -116,7 +116,7 @@ cpse_purge_http_replication({Source, Target}) ->
{changes, 1},
{purge_seq, 1},
{purge_infos, PurgeInfos}
- ]).
+ ], ?MODULE, ?LINE).
cpse_purge_internal_repl_disabled({Source, Target}) ->
diff --git a/src/couch_pse_tests/src/cpse_test_purge_seqs.erl b/src/couch_pse_tests/src/cpse_test_purge_seqs.erl
index 3ed54f4..b7b49b3 100644
--- a/src/couch_pse_tests/src/cpse_test_purge_seqs.erl
+++ b/src/couch_pse_tests/src/cpse_test_purge_seqs.erl
@@ -35,7 +35,7 @@ cpse_increment_purge_seq_on_complete_purge(DbName) ->
{update_seq, 2},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos1 = [
{cpse_util:uuid(), <<"foo1">>, [Rev1]}
@@ -49,7 +49,7 @@ cpse_increment_purge_seq_on_complete_purge(DbName) ->
{update_seq, 3},
{purge_seq, 1},
{purge_infos, PurgeInfos1}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos2 = [
{cpse_util:uuid(), <<"foo2">>, [Rev2]}
@@ -63,7 +63,7 @@ cpse_increment_purge_seq_on_complete_purge(DbName) ->
{update_seq, 4},
{purge_seq, 2},
{purge_infos, PurgeInfos1 ++ PurgeInfos2}
- ]).
+ ], ?MODULE, ?LINE).
cpse_increment_purge_multiple_times(DbName) ->
@@ -76,7 +76,7 @@ cpse_increment_purge_multiple_times(DbName) ->
{update_seq, 2},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos1 = [
{cpse_util:uuid(), <<"foo1">>, [Rev1]},
@@ -92,7 +92,7 @@ cpse_increment_purge_multiple_times(DbName) ->
{update_seq, 3},
{purge_seq, 2},
{purge_infos, PurgeInfos1}
- ]).
+ ], ?MODULE, ?LINE).
cpse_increment_purge_seq_on_partial_purge(DbName) ->
@@ -107,7 +107,7 @@ cpse_increment_purge_seq_on_partial_purge(DbName) ->
{update_seq, 2},
{purge_seq, 0},
{purge_infos, []}
- ]),
+ ], ?MODULE, ?LINE),
PurgeInfos1 = [
{cpse_util:uuid(), <<"foo1">>, [Rev1]}
@@ -121,4 +121,4 @@ cpse_increment_purge_seq_on_partial_purge(DbName) ->
{update_seq, 3},
{purge_seq, 1},
{purge_infos, PurgeInfos1}
- ]).
+ ], ?MODULE, ?LINE).
diff --git a/src/couch_pse_tests/src/cpse_util.erl b/src/couch_pse_tests/src/cpse_util.erl
index f0afe72..8925f69 100644
--- a/src/couch_pse_tests/src/cpse_util.erl
+++ b/src/couch_pse_tests/src/cpse_util.erl
@@ -183,16 +183,24 @@ uuid() ->
couch_uuids:random().
-assert_db_props(DbName, Props) when is_binary(DbName) ->
+assert_db_props(DbName, Props, Module, Line) when is_binary(DbName) ->
{ok, Db} = couch_db:open_int(DbName, []),
try
- assert_db_props(Db, Props)
+ assert_db_props(Db, Props, Module, Line)
+ catch error:{assertEqual, Props} ->
+ {_, Rest} = proplists:split(Props, [module, line]),
+ erlang:error({assertEqual, [{module, Module}, {line, Line} | Rest]})
after
couch_db:close(Db)
end;
-assert_db_props(Db, Props) ->
- assert_each_prop(Db, Props).
+assert_db_props(Db, Props, Module, Line) ->
+ try
+ assert_each_prop(Db, Props)
+ catch error:{assertEqual, Props} ->
+ {_, Rest} = proplists:split(Props, [module, line]),
+ erlang:error({assertEqual, [{module, Module}, {line, Line} | Rest]})
+ end.
assert_each_prop(_Db, []) ->