rabbit_mgmt_http_SUITE: make users_test less dependent on test execution order

Author: michaelklishin

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -554,49 +554,60 @@ vhosts_trace_test(Config) ->
 users_test(Config) ->
     assert_item(#{name => <<"guest">>, tags => [<<"administrator">>]},
                 http_get(Config, "/whoami")),
-    rpc(Config, application, set_env, [rabbitmq_management, login_session_timeout, 100]),
+    rabbit_ct_broker_helpers:rpc(Config, 0, application, set_env,
+                                    [rabbitmq_management, login_session_timeout, 100]),
     assert_item(#{name => <<"guest">>,
-                  tags => [<<"administrator">>],
-                  login_session_timeout => 100},
+                    tags => [<<"administrator">>],
+                    login_session_timeout => 100},
                 http_get(Config, "/whoami")),
-    http_get(Config, "/users/myuser", ?NOT_FOUND),
-    http_put_raw(Config, "/users/myuser", "Something not JSON", ?BAD_REQUEST),
-    http_put(Config, "/users/myuser", [{flim, <<"flam">>}], ?BAD_REQUEST),
-    http_put(Config, "/users/myuser", [{tags,     [<<"management">>]},
-                                       {password, <<"myuser">>}],
-             {group, '2xx'}),
-    http_put(Config, "/users/myuser", [{password_hash, <<"not_hash">>}], ?BAD_REQUEST),
-    http_put(Config, "/users/myuser", [{password_hash,
+    http_delete(Config, "/users/users_test", [?NO_CONTENT, ?NOT_FOUND]),
+    http_get(Config, "/users/users_test", [?NO_CONTENT, ?NOT_FOUND]),
+    http_put_raw(Config, "/users/users_test", "Something not JSON", ?BAD_REQUEST),
+    http_put(Config, "/users/users_test", [{flim, <<"flam">>}], ?BAD_REQUEST),
+    http_put(Config, "/users/users_test", [{tags,     [<<"management">>]},
+                                        {password, <<"users_test">>}],
+                {group, '2xx'}),
+    http_put(Config, "/users/users_test", [{password_hash, <<"not_hash">>}], ?BAD_REQUEST),
+    http_put(Config, "/users/users_test", [{password_hash,
                                         <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>},
-                                       {tags, <<"management">>}], {group, '2xx'}),
-    assert_item(#{name => <<"myuser">>, tags => [<<"management">>],
-                  password_hash => <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>,
-                  hashing_algorithm => <<"rabbit_password_hashing_sha256">>},
-                http_get(Config, "/users/myuser")),
+                                        {tags, <<"management">>}], {group, '2xx'}),
+    assert_item(#{name => <<"users_test">>, tags => [<<"management">>],
+                    password_hash => <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>,
+                    hashing_algorithm => <<"rabbit_password_hashing_sha256">>},
+                http_get(Config, "/users/users_test")),
 
-    http_put(Config, "/users/myuser", [{password_hash,
+    http_put(Config, "/users/users_test", [{password_hash,
                                         <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>},
-                                       {hashing_algorithm, <<"rabbit_password_hashing_md5">>},
-                                       {tags, [<<"management">>]}], {group, '2xx'}),
-    assert_item(#{name => <<"myuser">>, tags => [<<"management">>],
-                  password_hash => <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>,
-                  hashing_algorithm => <<"rabbit_password_hashing_md5">>},
-                http_get(Config, "/users/myuser")),
-    http_put(Config, "/users/myuser", [{password, <<"password">>},
-                                       {tags, [<<"administrator">>, <<"foo">>]}], {group, '2xx'}),
-    assert_item(#{name => <<"myuser">>, tags => [<<"administrator">>, <<"foo">>]},
-                http_get(Config, "/users/myuser")),
-    assert_list(lists:sort([#{name => <<"myuser">>, tags => [<<"administrator">>, <<"foo">>]},
-                 #{name => <<"guest">>, tags => [<<"administrator">>]}]),
-                lists:sort(http_get(Config, "/users"))),
-    test_auth(Config, ?OK, [auth_header("myuser", "password")]),
-    http_put(Config, "/users/myuser", [{password, <<"password">>},
-                     {tags, []}], {group, '2xx'}),
-    assert_item(#{name => <<"myuser">>, tags => []},
-                http_get(Config, "/users/myuser")),
-    http_delete(Config, "/users/myuser", {group, '2xx'}),
-    test_auth(Config, ?NOT_AUTHORISED, [auth_header("myuser", "password")]),
-    http_get(Config, "/users/myuser", ?NOT_FOUND),
+                                        {hashing_algorithm, <<"rabbit_password_hashing_md5">>},
+                                        {tags, [<<"management">>]}], {group, '2xx'}),
+    assert_item(#{name => <<"users_test">>, tags => [<<"management">>],
+                    password_hash => <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>,
+                    hashing_algorithm => <<"rabbit_password_hashing_md5">>},
+                http_get(Config, "/users/users_test")),
+    http_put(Config, "/users/users_test", [{password, <<"password">>},
+                                        {tags, [<<"administrator">>, <<"foo">>]}], {group, '2xx'}),
+    assert_item(#{name => <<"users_test">>, tags => [<<"administrator">>, <<"foo">>]},
+                http_get(Config, "/users/users_test")),
+    Listed = lists:sort(http_get(Config, "/users")),
+    ct:pal("Listed users: ~tp", [Listed]),
+    User1 = #{name => <<"users_test">>, tags => [<<"administrator">>, <<"foo">>]},
+    User2 = #{name => <<"guest">>, tags => [<<"administrator">>]},
+    ?assert(lists:any(fun(U) ->
+                maps:get(name, U) =:= maps:get(name, User1) andalso
+                maps:get(tags, U) =:= maps:get(tags, User1)
+            end, Listed)),
+    ?assert(lists:any(fun(U) ->
+                maps:get(name, U) =:= maps:get(name, User2) andalso
+                maps:get(tags, U) =:= maps:get(tags, User2)
+            end, Listed)),
+    test_auth(Config, ?OK, [auth_header("users_test", "password")]),
+    http_put(Config, "/users/users_test", [{password, <<"password">>},
+                        {tags, []}], {group, '2xx'}),
+    assert_item(#{name => <<"users_test">>, tags => []},
+                http_get(Config, "/users/users_test")),
+    http_delete(Config, "/users/users_test", {group, '2xx'}),
+    test_auth(Config, ?NOT_AUTHORISED, [auth_header("users_test", "password")]),
+    http_get(Config, "/users/users_test", ?NOT_FOUND),
     passed.
 
 without_permissions_users_test(Config) ->