diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 10:17:43 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 10:17:43 +0200 |
| commit | c9ecb00da9c41004630c2a74da884dd399b6d5cf (patch) | |
| tree | 1f0b6e7a669e3ab317c7792cd968dc5d63311d5a | |
| parent | b57fd49355334875ce5f2a47e83357e210f632d5 (diff) | |
| parent | 2cdf0c174217970ba6912de225f1b19229948964 (diff) | |
| download | rabbitmq-server-git-c9ecb00da9c41004630c2a74da884dd399b6d5cf.tar.gz | |
Merge branch 'master' into rabbitmq-server-351
| -rw-r--r-- | test/src/gm_qc.erl | 4 | ||||
| -rw-r--r-- | test/src/rabbit_backing_queue_qc.erl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/src/gm_qc.erl b/test/src/gm_qc.erl index c6b33a2b9f..ce6bb40975 100644 --- a/test/src/gm_qc.erl +++ b/test/src/gm_qc.erl @@ -30,7 +30,7 @@ next_state/3]). -behaviour(gm). --export([joined/2, members_changed/3, handle_msg/3, terminate/2]). +-export([joined/2, members_changed/3, handle_msg/3, handle_terminate/2]). %% Helpers -export([do_join/0, do_leave/1, do_send/1, do_proceed1/1, do_proceed2/2]). @@ -206,7 +206,7 @@ joined(Pid, _Members) -> Pid ! {joined, self()}, ok. members_changed(_Pid, _Bs, _Ds) -> ok. handle_msg(Pid, _From, Msg) -> Pid ! {gm, self(), Msg}, ok. -terminate(Pid, _Reason) -> Pid ! {left, self()}. +handle_terminate(Pid, _Reason) -> Pid ! {left, self()}. %% --------------------------------------------------------------------------- %% Helpers diff --git a/test/src/rabbit_backing_queue_qc.erl b/test/src/rabbit_backing_queue_qc.erl index a025823910..1469f61162 100644 --- a/test/src/rabbit_backing_queue_qc.erl +++ b/test/src/rabbit_backing_queue_qc.erl @@ -118,14 +118,14 @@ qc_publish(#state{bqstate = BQ}) -> {20, false}]), expiry = oneof([undefined | lists:seq(1, 10)]), size = 10}, - false, self(), BQ]}. + false, self(), noflow, BQ]}. qc_publish_multiple(#state{}) -> {call, ?MODULE, publish_multiple, [resize(?QUEUE_MAXLEN, pos_integer())]}. qc_publish_delivered(#state{bqstate = BQ}) -> {call, ?BQMOD, publish_delivered, - [qc_message(), #message_properties{size = 10}, self(), BQ]}. + [qc_message(), #message_properties{size = 10}, self(), noflow, BQ]}. qc_fetch(#state{bqstate = BQ}) -> {call, ?BQMOD, fetch, [boolean(), BQ]}. @@ -190,7 +190,7 @@ precondition(#state{len = Len}, {call, ?MODULE, publish_multiple, _Arg}) -> %% Model updates -next_state(S, BQ, {call, ?BQMOD, publish, [Msg, MsgProps, _Del, _Pid, _BQ]}) -> +next_state(S, BQ, {call, ?BQMOD, publish, [Msg, MsgProps, _Del, _Pid, _Flow, _BQ]}) -> #state{len = Len, messages = Messages, confirms = Confirms, @@ -216,7 +216,7 @@ next_state(S, _BQ, {call, ?MODULE, publish_multiple, [PublishCount]}) -> next_state(S, Res, {call, ?BQMOD, publish_delivered, - [Msg, MsgProps, _Pid, _BQ]}) -> + [Msg, MsgProps, _Pid, _Flow, _BQ]}) -> #state{confirms = Confirms, acks = Acks, next_seq_id = NextSeq} = S, AckTag = {call, erlang, element, [1, Res]}, BQ1 = {call, erlang, element, [2, Res]}, |