Merge pull request #2438 from perlpunk/log-fatal

Use `croak` in OpenQA::Utils::log_fatal
os-autoinst · Oct 25, 2019 · 38381f1 · 38381f1
2 parents 8c3a5ec + 0e3dad9
commit 38381f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/OpenQA/Utils.pm b/lib/OpenQA/Utils.pm
@@ -236,7 +236,7 @@ sub log_error {
 # log_fatal("message"[, param1=>val1, param2=>val2]);
 sub log_fatal {
     _log_msg('fatal', @_);
-    die $_[0];
+    croak $_[0];
 }
 
 sub _current_log_level {

diff --git a/t/28-logging.t b/t/28-logging.t
@@ -154,14 +154,16 @@ subtest 'log fatal to stderr' => sub {
     $app->setup_log();
     $OpenQA::Utils::app = undef;    # To make sure we don't are setting it in other tests
     eval { log_fatal('fatal message'); };
+    my $eval_error       = $@;
     my $exception_raised = 0;
-    $exception_raised++ if $@;
+    $exception_raised++ if $eval_error;
     ### End of the Testing code ###
     # Close the capture (current stdout) and restore STDOUT (by dupping the old STDOUT);
     close STDERR;
     open(STDERR, '>&', $oldSTDERR) or die "Can't dup \$oldSTDERR: $!";
     ok($exception_raised == 1, 'Fatal raised exception');
     like($output, qr/\[FATAL\] fatal message/, 'OK fatal');
+    like($eval_error, qr{fatal message.*t/28-logging.t});
 
 };