diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2015-02-26 17:31:16 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2015-02-26 17:31:16 +0000 |
| commit | 989cde8ec1e3fe7b51cb2d0c8c7643f8a4e68886 (patch) | |
| tree | fc3707ceac552596240462887d7021b11a88230f /test/src | |
| parent | 1645f2218307244b468db9d9a438248c32b38bb7 (diff) | |
| parent | 280de0c58d388b1eb21a153f8dc8e94aa0a2c3f6 (diff) | |
| download | rabbitmq-server-git-989cde8ec1e3fe7b51cb2d0c8c7643f8a4e68886.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/rabbit_tests.erl | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl index c26dcf32aa..0774dd9ab5 100644 --- a/test/src/rabbit_tests.erl +++ b/test/src/rabbit_tests.erl @@ -786,9 +786,8 @@ test_log_management_during_startup() -> ok = case catch control_action(start_app, []) of ok -> exit({got_success_but_expected_failure, log_rotation_tty_no_handlers_test}); - {badrpc, {'EXIT', {rabbit,failure_during_boot, - {error,{cannot_log_to_tty, - _, not_installed}}}}} -> ok + {badrpc, {'EXIT', {error, + {cannot_log_to_tty, _, not_installed}}}} -> ok end, %% fix sasl logging @@ -815,8 +814,7 @@ test_log_management_during_startup() -> ok -> exit({got_success_but_expected_failure, log_rotation_no_write_permission_dir_test}); {badrpc, {'EXIT', - {rabbit, failure_during_boot, - {error, {cannot_log_to_file, _, _}}}}} -> ok + {error, {cannot_log_to_file, _, _}}}} -> ok end, %% start application with logging to a subdirectory which @@ -829,10 +827,10 @@ test_log_management_during_startup() -> ok -> exit({got_success_but_expected_failure, log_rotatation_parent_dirs_test}); {badrpc, - {'EXIT', {rabbit,failure_during_boot, - {error, {cannot_log_to_file, _, - {error, - {cannot_create_parent_dirs, _, eacces}}}}}}} -> ok + {'EXIT', + {error, {cannot_log_to_file, _, + {error, + {cannot_create_parent_dirs, _, eacces}}}}}} -> ok end, ok = set_permissions(TmpDir, 8#00700), ok = set_permissions(TmpLog, 8#00600), |