summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-02-08 12:17:16 +0300
committerMichael Klishin <mklishin@pivotal.io>2017-02-08 12:17:16 +0300
commit3b02c783169435db0835159fc06cebd5853dfd92 (patch)
treeb7676f8874e25489f3ff0eff91985d52b6b797cd /test
parenta2ffc12d06bfd23223ea4cefd3012fc93cc0e485 (diff)
parentf5b3d3ed6fbadd0bcf351db4774fdb349b7c7b3d (diff)
downloadrabbitmq-server-git-3b02c783169435db0835159fc06cebd5853dfd92.tar.gz
Merge branch 'stable'
Diffstat (limited to 'test')
-rw-r--r--test/unit_inbroker_SUITE.erl22
1 files changed, 8 insertions, 14 deletions
diff --git a/test/unit_inbroker_SUITE.erl b/test/unit_inbroker_SUITE.erl
index 4a03d3023d..f2451ce5c4 100644
--- a/test/unit_inbroker_SUITE.erl
+++ b/test/unit_inbroker_SUITE.erl
@@ -1694,24 +1694,18 @@ check_variable_queue_status(VQ0, Props) ->
%% ---------------------------------------------------------------------------
credit_flow_settings(Config) ->
- passed = rabbit_ct_broker_helpers:rpc(Config, 0,
+ rabbit_ct_broker_helpers:rpc(Config, 0,
?MODULE, credit_flow_settings1, [Config]).
credit_flow_settings1(_Config) ->
- %% default values
- passed = test_proc(400, 200),
-
- application:set_env(rabbit, credit_flow_default_credit, {600, 300}),
+ passed = test_proc(400, 200, {400, 200}),
passed = test_proc(600, 300),
-
- application:unset_env(rabbit, credit_flow_default_credit),
-
- % back to defaults
- passed = test_proc(400, 200),
passed.
test_proc(InitialCredit, MoreCreditAfter) ->
- Pid = spawn(fun dummy/0),
+ test_proc(InitialCredit, MoreCreditAfter, {InitialCredit, MoreCreditAfter}).
+test_proc(InitialCredit, MoreCreditAfter, Settings) ->
+ Pid = spawn(?MODULE, dummy, [Settings]),
Pid ! {credit, self()},
{InitialCredit, MoreCreditAfter} =
receive
@@ -1719,13 +1713,13 @@ test_proc(InitialCredit, MoreCreditAfter) ->
end,
passed.
-dummy() ->
+dummy(Settings) ->
credit_flow:send(self()),
receive
{credit, From} ->
- From ! {credit, get(credit_flow_default_credit)};
+ From ! {credit, Settings};
_ ->
- dummy()
+ dummy(Settings)
end.
%% -------------------------------------------------------------------