diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 06:51:36 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 06:51:36 +0200 |
| commit | 63eccd863a493795a92941af3be41af364e1d637 (patch) | |
| tree | 9e79a0eb981338ad2f10e071a96bc6317a0daed3 /test/src | |
| parent | 26531e144ef530e74816af869bf23a53c7374684 (diff) | |
| download | rabbitmq-server-git-63eccd863a493795a92941af3be41af364e1d637.tar.gz | |
fixes batch_publish tests
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/rabbit_tests.erl | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl index 9a06221edc..2235717ebf 100644 --- a/test/src/rabbit_tests.erl +++ b/test/src/rabbit_tests.erl @@ -2566,7 +2566,9 @@ variable_queue_batch_publish(IsPersistent, Count, PropFun, VQ) -> variable_queue_batch_publish(IsPersistent, Start, Count, PropFun, PayloadFun, VQ) -> variable_queue_batch_publish0(IsPersistent, Start, Count, PropFun, - PayloadFun, fun make_publish/4, VQ). + PayloadFun, fun make_publish/4, + fun rabbit_variable_queue:batch_publish/4, + VQ). variable_queue_batch_publish_delivered(IsPersistent, Count, VQ) -> variable_queue_batch_publish_delivered(IsPersistent, Count, fun (_N, P) -> P end, VQ). @@ -2577,16 +2579,24 @@ variable_queue_batch_publish_delivered(IsPersistent, Count, PropFun, VQ) -> variable_queue_batch_publish_delivered(IsPersistent, Start, Count, PropFun, PayloadFun, VQ) -> variable_queue_batch_publish0(IsPersistent, Start, Count, PropFun, - PayloadFun, fun make_publish_delivered/4, VQ). + PayloadFun, fun make_publish_delivered/4, + fun rabbit_variable_queue:batch_publish_delivered/4, + VQ). variable_queue_batch_publish0(IsPersistent, Start, Count, PropFun, PayloadFun, - MakePubFun, VQ) -> + MakePubFun, PubFun, VQ) -> Publishes = [MakePubFun(IsPersistent, PayloadFun, PropFun, N) || N <- lists:seq(Start, Start + Count - 1)], - VQ1 = rabbit_variable_queue:batch_publish(Publishes, self(), noflow, VQ), + Res = PubFun(Publishes, self(), noflow, VQ), + VQ1 = pub_res(Res), variable_queue_wait_for_shuffling_end(VQ1). +pub_res({_, VQS}) -> + VQS; +pub_res(VQS) -> + VQS. + make_publish(IsPersistent, PayloadFun, PropFun, N) -> {rabbit_basic:message( rabbit_misc:r(<<>>, exchange, <<>>), @@ -2717,7 +2727,7 @@ test_variable_queue_batch_publish(VQ) -> test_variable_queue_batch_publish_delivered(VQ) -> Count = 10, VQ1 = variable_queue_batch_publish_delivered(true, Count, VQ), - Count = rabbit_variable_queue:len(VQ1), + Count = rabbit_variable_queue:depth(VQ1), VQ1. test_variable_queue_fold(VQ0) -> |