summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-03-16 13:37:21 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-03-16 13:37:21 +0000
commit046d25da345ae888beaf9cc1f4125e596bc5eac1 (patch)
tree198f00bb0afe3a8cb891fb3e9663c91910cb7c2b
parenta65e7a57cb8f5bf4c4fe562d3ac3dae2a06f7ffd (diff)
downloadrabbitmq-server-046d25da345ae888beaf9cc1f4125e596bc5eac1.tar.gz
How could I forget those joyous uses of channel 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 930923e8..b8c3f4a9 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1121,8 +1121,9 @@ test_server_status() ->
%% create a few things so there is some useful information to list
Writer = spawn(fun () -> receive shutdown -> ok end end),
{ok, Ch} = rabbit_channel:start_link(
- 1, self(), Writer, rabbit_framing_amqp_0_9_1, user(<<"user">>),
- <<"/">>, [], self(), fun (_) -> {ok, self()} end),
+ 1, self(), Writer, self(), rabbit_framing_amqp_0_9_1,
+ user(<<"user">>), <<"/">>, [], self(),
+ fun (_) -> {ok, self()} end),
[Q, Q2] = [Queue || Name <- [<<"foo">>, <<"bar">>],
{new, Queue = #amqqueue{}} <-
[rabbit_amqqueue:declare(
@@ -1181,8 +1182,9 @@ test_spawn(Receiver) ->
Me = self(),
Writer = spawn(fun () -> Receiver(Me) end),
{ok, Ch} = rabbit_channel:start_link(
- 1, Me, Writer, rabbit_framing_amqp_0_9_1, user(<<"guest">>),
- <<"/">>, [], self(), fun (_) -> {ok, self()} end),
+ 1, Me, Writer, Me, rabbit_framing_amqp_0_9_1,
+ user(<<"guest">>), <<"/">>, [], self(),
+ fun (_) -> {ok, self()} end),
ok = rabbit_channel:do(Ch, #'channel.open'{}),
receive #'channel.open_ok'{} -> ok
after 1000 -> throw(failed_to_receive_channel_open_ok)