summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2011-09-06 14:41:44 +0100
committerEmile Joubert <emile@rabbitmq.com>2011-09-06 14:41:44 +0100
commite38790da3410305c1cb4f2f8c34d321c0c585f7b (patch)
treeb992b2b7d0efb45c0e8a2c0682e5af282ab1693e
parent07731f9c259a361025ae09847840c85424575fa7 (diff)
parentdc2e200b1a75cac7531da2c3d95363e09e712226 (diff)
downloadrabbitmq-server-bug23866.tar.gz
Merged bug24403 into bug23866bug23866
-rw-r--r--src/rabbit_tests.erl13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index cd5d9be0..7e84251f 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -757,13 +757,23 @@ test_topic_expect_match(X, List) ->
end, List).
test_app_management() ->
- %% starting, stopping, status
+ control_action(wait, [rabbit_mnesia:dir() ++ ".pid"]),
+ %% Starting, stopping and diagnostics. Note that we don't try
+ %% 'report' when the rabbit app is stopped and that we enable
+ %% tracing for the duration of this function.
+ ok = control_action(trace_on, []),
ok = control_action(stop_app, []),
ok = control_action(stop_app, []),
ok = control_action(status, []),
+ ok = control_action(cluster_status, []),
+ ok = control_action(environment, []),
ok = control_action(start_app, []),
ok = control_action(start_app, []),
ok = control_action(status, []),
+ ok = control_action(report, []),
+ ok = control_action(cluster_status, []),
+ ok = control_action(environment, []),
+ ok = control_action(trace_off, []),
passed.
test_log_management() ->
@@ -1146,6 +1156,7 @@ test_user_management() ->
ok = control_action(add_user, ["foo", "bar"]),
{error, {user_already_exists, _}} =
control_action(add_user, ["foo", "bar"]),
+ ok = control_action(clear_password, ["foo"]),
ok = control_action(change_password, ["foo", "baz"]),
TestTags = fun (Tags) ->