Fix tests, the exceptions are a bit cleaner now (bug26610)

Author: Simon MacMullen

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),