diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-22 13:59:13 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-22 13:59:13 +0000 |
| commit | b7751b9d8fa31ccc289a5708d9b0618581496b58 (patch) | |
| tree | ab51b5d3f846dc1f83f18c3e4df356413c1b9207 /src | |
| parent | 6a84c254fc2a911a1d38383037362733841c2222 (diff) | |
| parent | 8e9c6fbf09a85522815c70683b2d2a3ecbf2c288 (diff) | |
| download | rabbitmq-server-git-b7751b9d8fa31ccc289a5708d9b0618581496b58.tar.gz | |
merge bug25360 into stable
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_tests.erl | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 7a0ed1af41..1e02ff6bff 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1084,16 +1084,9 @@ test_policy_validation() -> rabbit_runtime_parameters_test:unregister_policy_validator(), passed. -writer() -> - receive - {'$gen_call', From, flush} -> gen_server:reply(From, ok), - writer(); - shutdown -> ok - end. - test_server_status() -> %% create a few things so there is some useful information to list - Writer = spawn(fun writer/0), + Writer = spawn(fun test_writer/0), {ok, Ch} = rabbit_channel:start_link( 1, self(), Writer, self(), "", rabbit_framing_amqp_0_9_1, user(<<"user">>), <<"/">>, [], self(), @@ -1167,10 +1160,15 @@ test_server_status() -> passed. +test_writer() -> test_writer(none). + test_writer(Pid) -> receive - shutdown -> ok; - {send_command, Method} -> Pid ! Method, test_writer(Pid) + {'$gen_call', From, flush} -> gen_server:reply(From, ok), + test_writer(Pid); + {send_command, Method} -> Pid ! Method, + test_writer(Pid); + shutdown -> ok end. test_spawn() -> |