summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-07-19 19:47:27 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-07-19 19:47:27 +0100
commit60f4000aef1fb7964cd80b2d7a843e0a469d84aa (patch)
treec49178aac52b238184ecf96eef46f2760168b12b
parent61974b44a7e5d031428411397d314ea3ebb72e9e (diff)
downloadrabbitmq-server-60f4000aef1fb7964cd80b2d7a843e0a469d84aa.tar.gz
cosmetic
-rw-r--r--src/rabbit_tests.erl27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 7593c081..c12872f2 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1398,10 +1398,10 @@ msg_store_write(Guids, MSCState) ->
msg_store_remove(Guids) ->
rabbit_msg_store:remove(?PERSISTENT_MSG_STORE, Guids).
-foreach_with_msg_store_client(Store, Ref, Fun, L) ->
+foreach_with_msg_store_client(MsgStore, Ref, Fun, L) ->
rabbit_msg_store:client_terminate(
- lists:foldl(fun (Guid, MSCState) -> Fun(Guid, Store, MSCState) end,
- rabbit_msg_store:client_init(Store, Ref), L)).
+ lists:foldl(fun (Guid, MSCState) -> Fun(Guid, MsgStore, MSCState) end,
+ rabbit_msg_store:client_init(MsgStore, Ref), L)).
test_msg_store() ->
restart_msg_store_empty(),
@@ -1501,17 +1501,17 @@ test_msg_store() ->
Payload = << 0:PayloadSizeBits >>,
ok = foreach_with_msg_store_client(
?PERSISTENT_MSG_STORE, Ref,
- fun (Guid, Store, MSCStateM) ->
- {ok, MSCStateN} =
- rabbit_msg_store:write(Store, Guid, Payload, MSCStateM),
+ fun (Guid, MsgStore, MSCStateM) ->
+ {ok, MSCStateN} = rabbit_msg_store:write(
+ MsgStore, Guid, Payload, MSCStateM),
MSCStateN
end, GuidsBig),
%% now read them to ensure we hit the fast client-side reading
ok = foreach_with_msg_store_client(
?PERSISTENT_MSG_STORE, Ref,
- fun (Guid, Store, MSCStateM) ->
- {{ok, Payload}, MSCStateN} =
- rabbit_msg_store:read(Store, Guid, MSCStateM),
+ fun (Guid, MsgStore, MSCStateM) ->
+ {{ok, Payload}, MSCStateN} = rabbit_msg_store:read(
+ MsgStore, Guid, MSCStateM),
MSCStateN
end, GuidsBig),
%% .., then 3s by 1...
@@ -1718,11 +1718,10 @@ variable_queue_publish(IsPersistent, Count, VQ) ->
rabbit_variable_queue:publish(
rabbit_basic:message(
rabbit_misc:r(<<>>, exchange, <<>>),
- <<>>, #'P_basic'{delivery_mode =
- case IsPersistent of
- true -> 2;
- false -> 1
- end}, <<>>), VQN)
+ <<>>, #'P_basic'{delivery_mode = case IsPersistent of
+ true -> 2;
+ false -> 1
+ end}, <<>>), VQN)
end, VQ, lists:seq(1, Count)).
variable_queue_fetch(Count, IsPersistent, IsDelivered, Len, VQ) ->