diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-28 17:01:30 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-28 17:01:30 +0000 |
| commit | 853e52016edf7bc637269554ebdd2bcb92e7947f (patch) | |
| tree | f71f82bc10f96a3bd21427ce13720ce26b08e37a | |
| parent | aabcfbb00fb7b914bde0b28dabbde81b4e7e233e (diff) | |
| download | rabbitmq-server-853e52016edf7bc637269554ebdd2bcb92e7947f.tar.gz | |
tweak
| -rw-r--r-- | src/rabbit_tests.erl | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 6b45b021..3f32b003 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1697,7 +1697,6 @@ test_backing_queue() -> passed = test_queue_index(), passed = test_queue_index_props(), passed = test_variable_queue(), - passed = test_variable_queue_fold(), passed = test_variable_queue_delete_msg_store_files_callback(), passed = test_queue_recover(), application:set_env(rabbit, queue_index_max_journal_entries, @@ -2300,15 +2299,25 @@ wait_for_confirms(Unconfirmed) -> end end. -test_variable_queue_fold() -> +test_variable_queue() -> + [passed = with_fresh_variable_queue(F) || + F <- [fun test_variable_queue_dynamic_duration_change/1, + fun test_variable_queue_partial_segments_delta_thing/1, + fun test_variable_queue_all_the_bits_not_covered_elsewhere1/1, + fun test_variable_queue_all_the_bits_not_covered_elsewhere2/1, + fun test_drop/1, + fun test_variable_queue_fold_msg_on_disk/1, + fun test_dropwhile/1, + fun test_dropwhile_varying_ram_duration/1, + fun test_variable_queue_ack_limiting/1, + fun test_variable_queue_requeue/1]], Count = rabbit_queue_index:next_segment_boundary(0), [passed = with_fresh_variable_queue( - fun (VQ) -> test_variable_queue_fold_shortcut(VQ, Cut) end) || + fun (VQ) -> test_variable_queue_fold(Cut, Count, VQ) end) || Cut <- [0, 1, 2, Count div 2, Count - 1, Count, Count + 1, Count * 2]], passed. -test_variable_queue_fold_shortcut(VQ0, Cut) -> - Count = rabbit_queue_index:next_segment_boundary(0), +test_variable_queue_fold(Cut, Count, VQ0) -> Msg2Int = fun (#basic_message{ content = #content{ payload_fragments_rev = P}}) -> binary_to_term(list_to_binary(lists:reverse(P))) @@ -2326,20 +2335,6 @@ test_variable_queue_fold_shortcut(VQ0, Cut) -> [Msg2Int(M) || M <- Acc], VQ3. -test_variable_queue() -> - [passed = with_fresh_variable_queue(F) || - F <- [fun test_variable_queue_dynamic_duration_change/1, - fun test_variable_queue_partial_segments_delta_thing/1, - fun test_variable_queue_all_the_bits_not_covered_elsewhere1/1, - fun test_variable_queue_all_the_bits_not_covered_elsewhere2/1, - fun test_drop/1, - fun test_variable_queue_fold_msg_on_disk/1, - fun test_dropwhile/1, - fun test_dropwhile_varying_ram_duration/1, - fun test_variable_queue_ack_limiting/1, - fun test_variable_queue_requeue/1]], - passed. - test_variable_queue_requeue(VQ0) -> Interval = 50, Count = rabbit_queue_index:next_segment_boundary(0) + 2 * Interval, |