summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-01-19 14:19:43 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2013-01-19 14:19:43 +0000
commitb0370eb8cab1251b72780f0884bc70d174c3f351 (patch)
treed2b06cb0a0955a1db94b8d893873c1b9269725d9
parent88f1c4487b75dddf8bd21692ae4ed86fefa35038 (diff)
downloadrabbitmq-server-git-b0370eb8cab1251b72780f0884bc70d174c3f351.tar.gz
tiny refactor on variable_queue_with_holes
-rw-r--r--src/rabbit_tests.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index b845360e86..13454d31e7 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -2328,7 +2328,8 @@ test_variable_queue() ->
passed.
test_variable_queue_fold(VQ0) ->
- {Count, RequeuedMsgs, FreshMsgs, VQ1} = variable_queue_with_holes(VQ0),
+ {RequeuedMsgs, FreshMsgs, VQ1} = variable_queue_with_holes(VQ0),
+ Count = rabbit_variable_queue:len(VQ1),
Msgs = RequeuedMsgs ++ FreshMsgs,
lists:foldl(
fun (Cut, VQ2) -> test_variable_queue_fold(Cut, Msgs, VQ2) end,
@@ -2398,10 +2399,10 @@ variable_queue_with_holes(VQ0) ->
Depth = rabbit_variable_queue:depth(VQ8),
Len = Depth - length(Subset3),
Len = rabbit_variable_queue:len(VQ8),
- {Len, (Seq -- Seq3), lists:seq(Count + 1, Count + 64), VQ8}.
+ {(Seq -- Seq3), lists:seq(Count + 1, Count + 64), VQ8}.
test_variable_queue_requeue(VQ0) ->
- {_, RequeuedMsgs, FreshMsgs, VQ1} = variable_queue_with_holes(VQ0),
+ {RequeuedMsgs, FreshMsgs, VQ1} = variable_queue_with_holes(VQ0),
Msgs =
lists:zip(RequeuedMsgs,
lists:duplicate(length(RequeuedMsgs), true)) ++