diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-12-21 18:58:26 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-12-21 18:58:26 +0000 |
| commit | 8cee1d4be1fac4c51a2047334b86afab4f7fd67a (patch) | |
| tree | b09209668a23cee6519ed22e58d79af59a4ec8e4 /src | |
| parent | b5bedc8c2759dce5c6fd2515f4b34502e7b9647a (diff) | |
| download | rabbitmq-server-git-8cee1d4be1fac4c51a2047334b86afab4f7fd67a.tar.gz | |
fix tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_tests.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index adf968cbe9..057d651099 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1956,7 +1956,7 @@ test_variable_queue_dynamic_duration_change(VQ0) -> %% drain {VQ8, AckTags} = variable_queue_fetch(Len, false, false, Len, VQ7), - {_, VQ9} = rabbit_variable_queue:ack(AckTags, VQ8), + VQ9 = rabbit_variable_queue:ack(AckTags, VQ8), {empty, VQ10} = rabbit_variable_queue:fetch(true, VQ9), VQ10. @@ -1966,7 +1966,7 @@ publish_fetch_and_ack(0, _Len, VQ0) -> publish_fetch_and_ack(N, Len, VQ0) -> VQ1 = variable_queue_publish(false, 1, VQ0), {{_Msg, false, AckTag, Len}, VQ2} = rabbit_variable_queue:fetch(true, VQ1), - {_, VQ3} = rabbit_variable_queue:ack([AckTag], VQ2), + VQ3 = rabbit_variable_queue:ack([AckTag], VQ2), publish_fetch_and_ack(N-1, Len, VQ3). test_variable_queue_partial_segments_delta_thing(VQ0) -> @@ -2000,7 +2000,7 @@ test_variable_queue_partial_segments_delta_thing(VQ0) -> {len, HalfSegment + 1}]), {VQ8, AckTags1} = variable_queue_fetch(HalfSegment + 1, true, false, HalfSegment + 1, VQ7), - {_, VQ9} = rabbit_variable_queue:ack(AckTags ++ AckTags1, VQ8), + VQ9 = rabbit_variable_queue:ack(AckTags ++ AckTags1, VQ8), %% should be empty now {empty, VQ10} = rabbit_variable_queue:fetch(true, VQ9), VQ10. diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index aa6d3a8730..4879cf32b7 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1393,8 +1393,8 @@ msgs_confirmed(GuidSet, State) -> {gb_sets:to_list(GuidSet), remove_confirms(GuidSet, State)}. msgs_written_to_disk(QPid, GuidSet) -> - io:format("variable queue notified of msgs written to disk: ~p~n", - [gb_sets:size(GuidSet)]), + %%io:format("variable queue notified of msgs written to disk: ~p~n", + %% [gb_sets:size(GuidSet)]), rabbit_amqqueue:maybe_run_queue_via_backing_queue_async( QPid, fun (State = #vqstate { msgs_on_disk = MOD, msg_indices_on_disk = MIOD, @@ -1407,8 +1407,8 @@ msgs_written_to_disk(QPid, GuidSet) -> end). msg_indices_written_to_disk(QPid, GuidSet) -> - io:format("variable queue notified of msg idx written to disk: ~p~n", - [gb_sets:size(GuidSet)]), + %%io:format("variable queue notified of msg idx written to disk: ~p~n", + %% [gb_sets:size(GuidSet)]), rabbit_amqqueue:maybe_run_queue_via_backing_queue_async( QPid, fun (State = #vqstate { msgs_on_disk = MOD, msg_indices_on_disk = MIOD, |