diff options
Diffstat (limited to 'src/rabbit_tests.erl')
| -rw-r--r-- | src/rabbit_tests.erl | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 8f0a3a89..bcfce33a 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -507,16 +507,17 @@ test_user_management() -> {error, {no_such_vhost, _}} = control_action(delete_vhost, ["/testhost"]), {error, {no_such_user, _}} = - control_action(set_permissions, ["foo", ".*", ".*", ".*"]), + control_action(map_user_vhost, ["foo", "/"]), {error, {no_such_user, _}} = - control_action(clear_permissions, ["foo"]), + control_action(unmap_user_vhost, ["foo", "/"]), {error, {no_such_user, _}} = - control_action(list_user_permissions, ["foo"]), + control_action(list_user_vhosts, ["foo"]), {error, {no_such_vhost, _}} = - control_action(list_permissions, ["-p", "/testhost"]), - {error, {invalid_regexp, _, _}} = - control_action(set_permissions, ["guest", "+foo", ".*", ".*"]), - + control_action(map_user_vhost, ["guest", "/testhost"]), + {error, {no_such_vhost, _}} = + control_action(unmap_user_vhost, ["guest", "/testhost"]), + {error, {no_such_vhost, _}} = + control_action(list_vhost_users, ["/testhost"]), %% user creation ok = control_action(add_user, ["foo", "bar"]), {error, {user_already_exists, _}} = @@ -531,16 +532,13 @@ test_user_management() -> ok = control_action(list_vhosts, []), %% user/vhost mapping - ok = control_action(set_permissions, ["-p", "/testhost", - "foo", ".*", ".*", ".*"]), - ok = control_action(set_permissions, ["-p", "/testhost", - "foo", ".*", ".*", ".*"]), - ok = control_action(list_permissions, ["-p", "/testhost"]), - ok = control_action(list_user_permissions, ["foo"]), + ok = control_action(map_user_vhost, ["foo", "/testhost"]), + ok = control_action(map_user_vhost, ["foo", "/testhost"]), + ok = control_action(list_user_vhosts, ["foo"]), %% user/vhost unmapping - ok = control_action(clear_permissions, ["-p", "/testhost", "foo"]), - ok = control_action(clear_permissions, ["-p", "/testhost", "foo"]), + ok = control_action(unmap_user_vhost, ["foo", "/testhost"]), + ok = control_action(unmap_user_vhost, ["foo", "/testhost"]), %% vhost deletion ok = control_action(delete_vhost, ["/testhost"]), @@ -549,8 +547,7 @@ test_user_management() -> %% deleting a populated vhost ok = control_action(add_vhost, ["/testhost"]), - ok = control_action(set_permissions, ["-p", "/testhost", - "foo", ".*", ".*", ".*"]), + ok = control_action(map_user_vhost, ["foo", "/testhost"]), ok = control_action(delete_vhost, ["/testhost"]), %% user deletion |