You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2021/10/27 18:22:57 UTC

[couchdb] 04/04: Mock `couch_log:warning/2`

This is an automated email from the ASF dual-hosted git repository.

jaydoane pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit c119ac72ce151676d0bbc95abe199b16f0df9a79
Author: Jay Doane <ja...@apache.org>
AuthorDate: Tue Oct 26 22:28:52 2021 -0700

    Mock `couch_log:warning/2`
    
    Prevent failures like:
    
      mem3_rep: find_source_seq_unknown_node_test...*failed*
    in function gen_server:call/2 (gen_server.erl, line 206)
    in call from couch_log:log/3 (src/couch_log.erl, line 73)
    in call from mem3_rep:find_source_seq_int/5 (src/mem3_rep.erl, line 248)
    in call from mem3_rep:'-find_source_seq_unknown_node_test/0-fun-0-'/0 (src/mem3_rep.erl, line 794)
    **exit:{noproc,{gen_server,call,
                        [couch_log_server,
                         {log,{log_entry,warning,<0.17426.5>,
                                         ["mem3_rep",32,102,105,110,100|...],
                                         "--------",
                                         ["2021",45,"10",45|...]}}]}}
      output:<<"">>
---
 src/mem3/src/mem3_rep.erl | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/mem3/src/mem3_rep.erl b/src/mem3/src/mem3_rep.erl
index 7fa0fc0..2487e6a 100644
--- a/src/mem3/src/mem3_rep.erl
+++ b/src/mem3/src/mem3_rep.erl
@@ -788,36 +788,53 @@ reset_remaining(#{} = Targets) ->
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 
+-define(TDEF(A), {atom_to_list(A), fun A/0}).
 
-find_source_seq_unknown_node_test() ->
+
+find_source_seq_int_test_() ->
+    {
+        setup,
+        fun() -> meck:expect(couch_log, warning, 2, ok) end,
+        fun(_) -> meck:unload() end,
+        [
+            ?TDEF(t_unknown_node),
+            ?TDEF(t_unknown_uuid),
+            ?TDEF(t_ok),
+            ?TDEF(t_old_ok),
+            ?TDEF(t_different_node)
+        ]
+    }.
+
+
+t_unknown_node() ->
     ?assertEqual(
         find_source_seq_int(doc_(), <<"foo">>, <<"bing">>, <<"bar_uuid">>, 10),
         0
     ).
 
 
-find_source_seq_unknown_uuid_test() ->
+t_unknown_uuid() ->
     ?assertEqual(
         find_source_seq_int(doc_(), <<"foo">>, <<"bar">>, <<"teapot">>, 10),
         0
     ).
 
 
-find_source_seq_ok_test() ->
+t_ok() ->
     ?assertEqual(
         find_source_seq_int(doc_(), <<"foo">>, <<"bar">>, <<"bar_uuid">>, 100),
         100
     ).
 
 
-find_source_seq_old_ok_test() ->
+t_old_ok() ->
     ?assertEqual(
         find_source_seq_int(doc_(), <<"foo">>, <<"bar">>, <<"bar_uuid">>, 84),
         50
     ).
 
 
-find_source_seq_different_node_test() ->
+t_different_node() ->
     ?assertEqual(
         find_source_seq_int(doc_(), <<"foo2">>, <<"bar">>, <<"bar_uuid">>, 92),
         31