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 2022/09/21 23:02:38 UTC

[couchdb] 01/01: Fix variable already bound warnings

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

jaydoane pushed a commit to branch fix-variable-already-bound
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 5dc0771bd4717463371611ab081346ef7f3b1ce3
Author: Jay Doane <ja...@apache.org>
AuthorDate: Tue Sep 20 09:10:39 2022 -0700

    Fix variable already bound warnings
    
    These warnings occur when compiling with OTP 25:
    
    src/mem3/test/eunit/mem3_reshard_api_test.erl:50:57: Warning: variable '_Persist' is already bound. If you mean to ignore this value, use '_' or a different underscore-prefixed name
---
 src/mem3/test/eunit/mem3_reshard_api_test.erl | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/mem3/test/eunit/mem3_reshard_api_test.erl b/src/mem3/test/eunit/mem3_reshard_api_test.erl
index 6e4107a5c..6cbc4dba8 100644
--- a/src/mem3/test/eunit/mem3_reshard_api_test.erl
+++ b/src/mem3/test/eunit/mem3_reshard_api_test.erl
@@ -46,10 +46,11 @@ teardown({Url, {Db1, Db2, Db3}}) ->
     delete_db(Url, Db1),
     delete_db(Url, Db2),
     delete_db(Url, Db3),
-    ok = config:delete("reshard", "max_jobs", _Persist = false),
-    ok = config:delete("reshard", "require_node_param", _Persist = false),
-    ok = config:delete("reshard", "require_range_param", _Persist = false),
-    ok = config:delete("admins", ?USER, _Persist = false),
+    Persist = false,
+    ok = config:delete("reshard", "max_jobs", Persist),
+    ok = config:delete("reshard", "require_node_param", Persist),
+    ok = config:delete("reshard", "require_range_param", Persist),
+    ok = config:delete("admins", ?USER, Persist),
     meck:unload().
 
 start_couch() ->
@@ -764,12 +765,13 @@ check_max_jobs({Top, {Db1, Db2, _}}) ->
     {timeout, ?TIMEOUT,
         ?_test(begin
             Jobs = Top ++ ?JOBS,
+            Persist = false,
 
-            config:set("reshard", "max_jobs", "0", _Persist = false),
+            config:set("reshard", "max_jobs", "0", Persist),
             {C1, R1} = req(post, Jobs, #{type => split, db => Db1}),
             ?assertMatch({500, [#{<<"error">> := <<"max_jobs_exceeded">>}]}, {C1, R1}),
 
-            config:set("reshard", "max_jobs", "1", _Persist = false),
+            config:set("reshard", "max_jobs", "1", Persist),
             {201, R2} = req(post, Jobs, #{type => split, db => Db1}),
             wait_to_complete(Top, R2),
 
@@ -784,13 +786,13 @@ check_max_jobs({Top, {Db1, Db2, _}}) ->
             ),
 
             % Allow the job to be created by raising max_jobs
-            config:set("reshard", "max_jobs", "2", _Persist = false),
+            config:set("reshard", "max_jobs", "2", Persist),
 
             {C4, R4} = req(post, Jobs, #{type => split, db => Db2}),
             ?assertEqual(201, C4),
 
             % Lower max_jobs after job is created but it's not running
-            config:set("reshard", "max_jobs", "1", _Persist = false),
+            config:set("reshard", "max_jobs", "1", Persist),
 
             % Start resharding again
             ?assertMatch({200, _}, req(put, Top ++ ?STATE, #{state => running})),
@@ -804,11 +806,12 @@ check_node_and_range_required_params({Top, {Db1, _, _}}) ->
     {timeout, ?TIMEOUT,
         ?_test(begin
             Jobs = Top ++ ?JOBS,
+            Persist = false,
 
             Node = atom_to_binary(node(), utf8),
             Range = <<"00000000-ffffffff">>,
 
-            config:set("reshard", "require_node_param", "true", _Persist = false),
+            config:set("reshard", "require_node_param", "true", Persist),
             {C1, R1} = req(post, Jobs, #{type => split, db => Db1}),
             NodeRequiredErr = <<"`node` prameter is required">>,
             ?assertEqual(
@@ -819,7 +822,7 @@ check_node_and_range_required_params({Top, {Db1, _, _}}) ->
                 {C1, R1}
             ),
 
-            config:set("reshard", "require_range_param", "true", _Persist = false),
+            config:set("reshard", "require_range_param", "true", Persist),
             {C2, R2} = req(post, Jobs, #{type => split, db => Db1, node => Node}),
             RangeRequiredErr = <<"`range` prameter is required">>,
             ?assertEqual(