SelfTest false positive vermeiden

[mfinanz.git] / SL / BackgroundJob / SelfTest.pm

diff --git a/SL/BackgroundJob/SelfTest.pm b/SL/BackgroundJob/SelfTest.pm
index 6137ced4270e8e5cd8e62d4481480a14aef24244..d4465721f169e5a62485bfeebb2ab4135edf2a6e 100644 (file)
--- a/SL/BackgroundJob/SelfTest.pm
+++ b/SL/BackgroundJob/SelfTest.pm
@@ -13,6 +13,8 @@ use FindBin;
 use SL::DB::AuthUser;
 use SL::DB::Default;
 use SL::Common;
 use SL::DB::AuthUser;
 use SL::DB::Default;
 use SL::Common;

+use SL::Locale::String qw(t8);
+use Carp;

 
 use Rose::Object::MakeMethods::Generic (
   array => [
 
 use Rose::Object::MakeMethods::Generic (
   array => [


@@ -61,11 +63,13 @@ sub run {
              $self->aggreg->failed,
              $self->aggreg->todo_passed,
   );
              $self->aggreg->failed,
              $self->aggreg->todo_passed,
   );

-
-  if (!$self->aggreg->all_passed || $self->config->{send_email_on_success}) {
+  # if (!$self->aggreg->all_passed || $self->config->{send_email_on_success}) {
+  # all_passed is not set or calculated (anymore). it is safe to check only for probs or errors
+  if ($self->aggreg->has_problems || $self->aggreg->has_errors || $self->config->{send_email_on_success}) {

     $self->_send_email;
   }
 
     $self->_send_email;
   }
 

+  croak t8("Unsuccessfully executed:" . join ("\n", $self->errors)) if $self->errors;

   return 1;
 }
 
   return 1;
 }
 


@@ -92,11 +96,10 @@ sub run_module {
   } or $self->add_errors($::locale->text('Could not load class #1 (#2): "#3"', $module, $file, $@)) && return;
 
   eval {
   } or $self->add_errors($::locale->text('Could not load class #1 (#2): "#3"', $module, $file, $@)) && return;
 
   eval {

-    my $worker = $module->new;
-    $worker->tester($self->tester);
-
-    $worker->run;
-    1;
+    $self->tester->subtest($module => sub {
+      $module->new->run;
+    });
+  1

   } or $self->add_errors($::locale->text('Could not load class #1, #2', $module, $@)) && return;
 
   $self->add_full_diag($output);
   } or $self->add_errors($::locale->text('Could not load class #1, #2', $module, $@)) && return;
 
   $self->add_full_diag($output);


@@ -153,8 +156,10 @@ sub _prepare_report {
   my %params = (
     SELF     => $self,
     host     => hostname,
   my %params = (
     SELF     => $self,
     host     => hostname,

-    database => $::myconfig{dbname},
+    database => $::auth->client->{dbname},
+    client   => $::auth->client->{name},

     path     => $FindBin::Bin,
     path     => $FindBin::Bin,

+    errors   => $self->errors,

   );
 
   my $output;
   );
 
   my $output;