X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FSelfTest.pm;h=b34b71d65ea61d1b011b27b4476140e02bee4320;hb=aeeea53192101dd80e4f3a5fae86b0e979bff1e5;hp=6137ced4270e8e5cd8e62d4481480a14aef24244;hpb=0d1bb5102f01eb03da55bc87b52ac52cd7ae7534;p=kivitendo-erp.git diff --git a/SL/BackgroundJob/SelfTest.pm b/SL/BackgroundJob/SelfTest.pm index 6137ced42..b34b71d65 100644 --- 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::Locale::String qw(t8); +use Carp; use Rose::Object::MakeMethods::Generic ( array => [ @@ -66,6 +68,7 @@ sub run { $self->_send_email; } + croak t8("Unsuccessfully executed:" . join ("\n", $self->errors)) if $self->errors; return 1; } @@ -92,11 +95,10 @@ sub run_module { } 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); @@ -153,8 +155,10 @@ sub _prepare_report { my %params = ( SELF => $self, host => hostname, - database => $::myconfig{dbname}, + database => $::auth->client->{dbname}, + client => $::auth->client->{name}, path => $FindBin::Bin, + errors => $self->errors, ); my $output;