rabbitmqctl tests

3 files changed, 34 insertions, 14 deletions

diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 4342e15b..0b39c53e 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -197,7 +197,7 @@ delete_vhost(VHostPath) ->
     lists:foreach(fun (Q) ->
                           {ok,_} = rabbit_amqqueue:delete(Q, false, false)
                   end,
-                  rabbit_amqqueue:list_vhost_queues(VHostPath)),
+                  rabbit_amqqueue:list(VHostPath)),
     R = rabbit_misc:execute_mnesia_transaction(
           rabbit_misc:with_vhost(
             VHostPath,
@@ -211,7 +211,7 @@ internal_delete_vhost(VHostPath) ->
     lists:foreach(fun (#exchange{name=Name}) ->
                           ok = rabbit_exchange:delete(Name, false)
                   end,
-                  rabbit_exchange:list_vhost_exchanges(VHostPath)),
+                  rabbit_exchange:list(VHostPath)),
     lists:foreach(fun (Username) ->
                           ok = unmap_user_vhost(Username, VHostPath)
                   end,
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 8b97d14b..d5a42f84 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -247,19 +247,10 @@ action(list_exchanges, Node, Args, Inform) ->
 action(list_bindings, Node, Args, Inform) ->
     Inform("Listing bindings", []),
     {VHostArg, _} = parse_vhost_flag(Args),
+    InfoKeys = [exchange_name, routing_key, queue_name, args],
     display_info_list(
-            lists:map(
-                fun({#resource{name = ExchangeName, virtual_host = _VirtualHost}, 
-                     #resource{name = QueueName, virtual_host = _VirtualHost},
-                     RoutingKey, 
-                     Arguments}) ->
-                    [{exchange_name, ExchangeName},
-                     {routing_key, RoutingKey},
-                     {queue_name, QueueName},
-                     {args, Arguments}]
-                end, 
-                rpc_call(Node, rabbit_exchange, list_bindings, [VHostArg])),
-            [exchange_name, routing_key, queue_name, args]),
+        [lists:zip(InfoKeys, tuple_to_list(X)) || X <- rpc_call(Node, rabbit_exchange, list_bindings, [VHostArg])], 
+        InfoKeys),
     ok;
 
 action(list_connections, Node, Args, Inform) ->
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 09e2cfe4..ada469aa 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -45,6 +45,7 @@ all_tests() ->
     passed = test_log_management_during_startup(),
     passed = test_cluster_management(),
     passed = test_user_management(),
+    passed = test_server_status(),
     passed.
 
 test_parsing() ->
@@ -462,6 +463,34 @@ test_user_management() ->
 
     passed.
 
+test_server_status() ->
+
+    % list queues
+    ok = control_action(list_queues, []),
+    ok = control_action(list_queues, ["name", "durable", "auto_delete",
+            "arguments", "pid", "messages_ready", "messages_unacknowledged", 
+            "messages_uncommitted", "messages", "acks_uncommitted", "consumers", 
+            "transactions", "memory"]),
+
+    % list exchanges
+    ok = control_action(list_exchanges, []),
+    ok = control_action(list_exchanges, ["name", "type", "durable", "auto_delete", 
+            "arguments"]),
+
+    % list bindings
+    ok = control_action(list_bindings, []),
+
+    % list connections
+    ok = control_action(list_connections, []),
+    ok = control_action(list_connections, ["pid", "address", "port", "peer_address", 
+            "peer_port", "state", "channels", "user", "vhost", "timeout", 
+            "frame_max", "recv_oct", "recv_cnt", "send_oct", "send_cnt", 
+            "send_pend passed"]),
+
+    passed.
+
+%---------------------------------------------------------------------
+
 %---------------------------------------------------------------------
 
 control_action(Command, Args) -> control_action(Command, node(), Args).