diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-11-28 14:13:16 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-11-28 14:13:16 +0000 |
| commit | 64c8f12830c31a8731221eb09ef3e13ade8a47dd (patch) | |
| tree | 990082e06bb6a128bf05d14a089f5afe4a44cd62 | |
| parent | 1aac7846e509bdc7ada3463eb00e908d51dd587f (diff) | |
| download | rabbitmq-server-bug25897.tar.gz | |
Ensure that we always interleave start / stop / start / stop.bug25897
| -rw-r--r-- | src/rabbit_tests.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 76421d1a..5fe319d3 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -808,6 +808,7 @@ test_log_management_during_startup() -> %% start application with logging to non-existing directory TmpLog = "/tmp/rabbit-tests/test.log", delete_file(TmpLog), + ok = control_action(stop_app, []), ok = application:set_env(rabbit, error_logger, {file, TmpLog}), ok = delete_log_handlers([rabbit_error_logger_file_h]), @@ -816,6 +817,7 @@ test_log_management_during_startup() -> %% start application with logging to directory with no %% write permissions + ok = control_action(stop_app, []), TmpDir = "/tmp/rabbit-tests", ok = set_permissions(TmpDir, 8#00400), ok = delete_log_handlers([rabbit_error_logger_file_h]), @@ -830,6 +832,7 @@ test_log_management_during_startup() -> %% start application with logging to a subdirectory which %% parent directory has no write permissions + ok = control_action(stop_app, []), TmpTestDir = "/tmp/rabbit-tests/no-permission/test/log", ok = application:set_env(rabbit, error_logger, {file, TmpTestDir}), ok = add_log_handlers([{error_logger_file_h, MainLog}]), @@ -849,12 +852,13 @@ test_log_management_during_startup() -> %% start application with standard error_logger_file_h %% handler not installed + ok = control_action(stop_app, []), ok = application:set_env(rabbit, error_logger, {file, MainLog}), ok = control_action(start_app, []), - ok = control_action(stop_app, []), %% start application with standard sasl handler not installed %% and rabbit main log handler installed correctly + ok = control_action(stop_app, []), ok = delete_log_handlers([rabbit_sasl_report_file_h]), ok = control_action(start_app, []), passed. |