[GitHub] [couchdb] jaydoane commented on a change in pull request #3804: Mem3 test fixes

[GitBox <gi...@apache.org>]

jaydoane commented on a change in pull request #3804:
URL: https://github.com/apache/couchdb/pull/3804#discussion_r737653683



##########
File path: src/mem3/test/eunit/mem3_bdu_test.erl
##########
@@ -87,133 +87,136 @@ t_can_insert_shard_map_doc({Top, Db}) ->
         <<"by_range">> => #{Range => [Node]},
         <<"suffix">> => suffix()
     },
-    {Code, Res} = req(post, Top ++ ?DBS, ShardMap),
+    {Code, Res} = req(post, Top ++ ShardsDb, ShardMap),
     ?assertEqual(201, Code),
     ?assertMatch(#{<<"ok">> := true}, Res).
 
 
-t_missing_by_node_section({Top, Db}) ->
+t_missing_by_node_section({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_range">> => #{Range => [Node]}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_by_node_not_a_map({Top, Db}) ->
+t_by_node_not_a_map({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => 42,
         <<"by_range">> => #{Range => [Node]}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_missing_by_range_section({Top, Db}) ->
+t_missing_by_range_section({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => #{Node => [Range]}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_by_range_not_a_map({Top, Db}) ->
+t_by_range_not_a_map({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => #{Node => [Range]},
         <<"by_range">> => 42
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_missing_range_in_by_range({Top, Db}) ->
+t_missing_range_in_by_range({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => #{Node => [Range]},
         <<"by_range">> => #{<<"xyz">> => [Node]}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_missing_node_in_by_range_node_list({Top, Db}) ->
+t_missing_node_in_by_range_node_list({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => #{Node => [Range]},
         <<"by_range">> => #{Range => [<<"xyz">>]}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_missing_node_in_by_node({Top, Db}) ->
+t_missing_node_in_by_node({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => #{<<"xyz">> => [Range]},
         <<"by_range">> => #{Range => [Node]}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_missing_range_in_by_node_range_list({Top, Db}) ->
+t_missing_range_in_by_node_range_list({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => #{Node => [<<"xyz">>]},
         <<"by_range">> => #{Range => [Node]}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_by_node_val_not_array({Top, Db}) ->
+t_by_node_val_not_array({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => #{Node => 42},
         <<"by_range">> => #{Range => [Node]}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_by_range_val_not_array({Top, Db}) ->
+t_by_range_val_not_array({Top, Db, ShardsDb}) ->
     Node = atom_to_binary(node(), utf8),
     Range = <<"00000000-ffffffff">>,
     ShardMap = #{
         <<"_id">> => Db,
         <<"by_node">> => #{Node => [Range]},
         <<"by_range">> => #{Range => 42}
     },
-    ?assertMatch({403, _}, req(post, Top ++ ?DBS, ShardMap)).
+    ?assertMatch({403, _}, req(post, Top ++ ShardsDb, ShardMap)).
 
 
-t_design_docs_are_not_validated({Top, _}) ->
-    DDoc = #{<<"_id">> => <<"_design/ddoc_bdu_test">>},
-    {Code, Res} = req(post, Top ++ ?DBS, DDoc),
+t_design_docs_are_not_validated({Top, _, ShardsDb}) ->
+    Suffix = integer_to_list(erlang:system_time() + rand:uniform(1000)),
+    DDocId = list_to_binary("_design/ddoc_bdu_test-" ++ Suffix),
+    ?debugVal(DDocId),

Review comment:
       Good catch!




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@couchdb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org