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 2020/05/22 15:47:44 UTC
[couchdb] branch remove-erlfdb-meck-from-update-docs-test created
(now b0a9bd2)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch remove-erlfdb-meck-from-update-docs-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at b0a9bd2 Remove erlfdb mock from update_docs/2,3 test
This branch includes the following new commits:
new b0a9bd2 Remove erlfdb mock from update_docs/2,3 test
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 01/01: Remove erlfdb mock from update_docs/2,3 test
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch remove-erlfdb-meck-from-update-docs-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b0a9bd2d71c3b1c35c34d3a4e8922f1d4374adf0
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Fri May 22 11:46:19 2020 -0400
Remove erlfdb mock from update_docs/2,3 test
In a constrained CI environment transactions could retry multiple times so we
cannot rely on precisely counting erlfdb:transactional/2 calls.
---
src/fabric/test/fabric2_update_docs_tests.erl | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/src/fabric/test/fabric2_update_docs_tests.erl b/src/fabric/test/fabric2_update_docs_tests.erl
index 5a2389a..469fa0d 100644
--- a/src/fabric/test/fabric2_update_docs_tests.erl
+++ b/src/fabric/test/fabric2_update_docs_tests.erl
@@ -54,12 +54,10 @@ teardown_all(Ctx) ->
setup() ->
{ok, Db} = fabric2_db:create(?tempdb(), [{user_ctx, ?ADMIN_USER}]),
- meck:new(erlfdb, [passthrough]),
Db.
cleanup(#{} = Db) ->
- meck:unload(),
ok = fabric2_db:delete(fabric2_db:name(Db), []).
@@ -108,9 +106,7 @@ update_docs_batches(Db) ->
Docs1 = [doc(9000), doc(9000)],
- meck:reset(erlfdb),
?assertMatch({ok, [_ | _]}, fabric2_db:update_docs(Db, Docs1, Opts)),
- ?assertEqual(2, meck:num_calls(erlfdb, transactional, 2)),
lists:foreach(fun(#doc{} = Doc) ->
?assertMatch({ok, #doc{}}, fabric2_db:open_doc(Db, Doc#doc.id))
@@ -118,9 +114,7 @@ update_docs_batches(Db) ->
Docs2 = [doc(10), doc(10), doc(9000), doc(10)],
- meck:reset(erlfdb),
?assertMatch({ok, [_ | _]}, fabric2_db:update_docs(Db, Docs2, Opts)),
- ?assertEqual(2, meck:num_calls(erlfdb, transactional, 2)),
lists:foreach(fun(#doc{} = Doc) ->
?assertMatch({ok, #doc{}}, fabric2_db:open_doc(Db, Doc#doc.id))
@@ -132,9 +126,7 @@ update_docs_replicated_batches(Db) ->
Docs1 = [doc(Size, {1, [rev()]}) || Size <- [9000, 9000]],
- meck:reset(erlfdb),
?assertMatch({ok, []}, fabric2_db:update_docs(Db, Docs1, Opts)),
- ?assertEqual(2, meck:num_calls(erlfdb, transactional, 2)),
lists:foreach(fun(#doc{} = Doc) ->
?assertEqual({ok, Doc}, fabric2_db:open_doc(Db, Doc#doc.id))
@@ -142,9 +134,7 @@ update_docs_replicated_batches(Db) ->
Docs2 = [doc(Size, {1, [rev()]}) || Size <- [10, 10, 9000, 10]],
- meck:reset(erlfdb),
?assertMatch({ok, []}, fabric2_db:update_docs(Db, Docs2, Opts)),
- ?assertEqual(2, meck:num_calls(erlfdb, transactional, 2)),
lists:foreach(fun(#doc{} = Doc) ->
?assertEqual({ok, Doc}, fabric2_db:open_doc(Db, Doc#doc.id))
@@ -168,10 +158,8 @@ update_docs_duplicate_ids_with_batches(Db) ->
Doc = doc(9000),
- meck:reset(erlfdb),
Res = fabric2_db:update_docs(Db, [Doc, doc(9000), Doc], Opts),
?assertMatch({ok, [_, _, _]}, Res),
- ?assertEqual(3, meck:num_calls(erlfdb, transactional, 2)),
{ok, [Doc1Res, Doc2Res, Doc3Res]} = Res,
?assertMatch({ok, {1, <<_/binary>>}}, Doc1Res),
@@ -185,9 +173,7 @@ update_docs_replicate_batches_duplicate_id(Db) ->
Doc = doc(10, {1, [rev()]}),
Docs = [Doc, Doc],
- meck:reset(erlfdb),
?assertMatch({ok, []}, fabric2_db:update_docs(Db, Docs, Opts)),
- ?assertEqual(2, meck:num_calls(erlfdb, transactional, 2)),
?assertEqual({ok, Doc}, fabric2_db:open_doc(Db, Doc#doc.id)).