summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2010-02-04 20:37:59 +0000
committerMatthias Radestock <matthias@lshift.net>2010-02-04 20:37:59 +0000
commit96d77a12cd7d355ab23d7eb95e3627392683f185 (patch)
tree2ebda18c9050f5982778b9e53dd33e8c8d61038e
parent9581cde5ce3a1ec7777996dd6150028b8b0b3b6b (diff)
downloadrabbitmq-server-96d77a12cd7d355ab23d7eb95e3627392683f185.tar.gz
exercise some more code paths in tests
-rw-r--r--src/rabbit_tests.erl10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 2a580b98..aaa2454e 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -715,9 +715,11 @@ test_server_status() ->
%% create a few things so there is some useful information to list
Writer = spawn(fun () -> receive shutdown -> ok end end),
Ch = rabbit_channel:start_link(1, self(), Writer, <<"user">>, <<"/">>),
- Q = #amqqueue{} = rabbit_amqqueue:declare(
- rabbit_misc:r(<<"/">>, queue, <<"foo">>),
- false, false, []),
+ [Q, Q2] = [#amqqueue{} = rabbit_amqqueue:declare(
+ rabbit_misc:r(<<"/">>, queue, Name),
+ false, false, []) ||
+ Name <- [<<"foo">>, <<"bar">>]],
+
ok = rabbit_amqqueue:claim_queue(Q, self()),
ok = rabbit_amqqueue:basic_consume(Q, true, self(), Ch, undefined,
<<"ctag">>, true, undefined),
@@ -749,7 +751,7 @@ test_server_status() ->
ok = control_action(list_consumers, []),
%% cleanup
- {ok, _} = rabbit_amqqueue:delete(Q, false, false),
+ [{ok, _} = rabbit_amqqueue:delete(QR, false, false) || QR <- [Q, Q2]],
ok = rabbit_channel:shutdown(Ch),
passed.