diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2019-05-08 00:33:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 00:33:18 +0300 |
| commit | 43dfd5021b0fb012316ec6e9ad388f2cae14ef02 (patch) | |
| tree | 6e4de4cb750bfa0bbd2e1205ec2619ffb8a61b91 | |
| parent | a4033d826ed4f7546019753cb98b1cdca1939210 (diff) | |
| parent | 8a7e2963fbdc4ebccd70a4a4ff0c0ed74e7718e6 (diff) | |
| download | rabbitmq-server-git-43dfd5021b0fb012316ec6e9ad388f2cae14ef02.tar.gz | |
Merge pull request #2004 from rabbitmq/send-drained-type-fix
Fix type issues with send_drained message
| -rw-r--r-- | src/rabbit_fifo.erl | 2 | ||||
| -rw-r--r-- | test/rabbit_fifo_SUITE.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_fifo.erl b/src/rabbit_fifo.erl index d5893e9d7f..d9566ea8f7 100644 --- a/src/rabbit_fifo.erl +++ b/src/rabbit_fifo.erl @@ -236,7 +236,7 @@ apply(Meta, #credit{credit = NewCredit, delivery_count = RemoteDelCnt, {State1#?MODULE{consumers = Consumers}, %% returning a multi response with two client actions %% for the channel to execute - {multi, [Response, {send_drained, [{CTag, Drained}]}]}, + {multi, [Response, {send_drained, {CTag, Drained}}]}, Effects} end; _ when Waiting0 /= [] -> diff --git a/test/rabbit_fifo_SUITE.erl b/test/rabbit_fifo_SUITE.erl index b0f919c473..b992401575 100644 --- a/test/rabbit_fifo_SUITE.erl +++ b/test/rabbit_fifo_SUITE.erl @@ -138,7 +138,7 @@ credit_with_drained_test(_) -> delivery_count = 5}}}, State), ?assertEqual({multi, [{send_credit_reply, 0}, - {send_drained, [{?FUNCTION_NAME, 5}]}]}, + {send_drained, {?FUNCTION_NAME, 5}}]}, Result), ok. @@ -153,7 +153,7 @@ credit_and_drain_test(_) -> ?ASSERT_NO_EFF({send_msg, _, {delivery, _, _}}, CheckEffs), {State4, {multi, [{send_credit_reply, 0}, - {send_drained, [{?FUNCTION_NAME, 2}]}]}, + {send_drained, {?FUNCTION_NAME, 2}}]}, Effects} = apply(meta(4), rabbit_fifo:make_credit(Cid, 4, 0, true), State3), ?assertMatch(#rabbit_fifo{consumers = #{Cid := #consumer{credit = 0, delivery_count = 4}}}, |