t: Use implicit Test::Exception functions for the test

https://progress.opensuse.org/issues/176862

Author: b10n1k

t/15-assets.t

@@ -111,8 +111,7 @@ $workercaps->{websocket_api_version} = 999999;
 throws_ok { $w = $c->_register($schema, 'host', '1', $workercaps) } qr/Incompatible websocket API version/,
   'Worker different version - incompatible version exception';
 $workercaps->{websocket_api_version} = WEBSOCKET_API_VERSION;
-eval { $w = $c->_register($schema, 'host', '1', $workercaps); };
-ok(!$@, 'Worker correct version');
+lives_ok { $w = $c->_register($schema, 'host', '1', $workercaps); } 'Worker correct version';
 
 my $worker = $schema->resultset('Workers')->find($w);
 is($worker->websocket_api_version(), WEBSOCKET_API_VERSION, 'Worker version set correctly');

t/16-utils-job-templates.t

@@ -60,18 +60,14 @@ is scalar @$errors, 1, "Invalid toplevel key detected" or diag "Error: $_" for @
 like($errors->[0], qr{/: Properties not allowed: invalid.}, 'Invalid toplevel key error message');
 
 subtest load_yaml => sub {
-    eval { load_yaml(file => $template_openqa_dupkey) };
-    my $err = $@;
-    like($err, qr{Duplicate key 'foo'}, 'Duplicate key detected');
+    throws_ok { load_yaml(file => $template_openqa_dupkey) } qr{Duplicate key 'foo'}, 'Duplicate key detected';
 
     my $cyclic = <<"EOM";
     - &ALIAS
       foo: *ALIAS
 EOM
 
-    eval { my $data = load_yaml(string => $cyclic) };
-    $err = $@;
-    like $err, qr{Found cyclic ref}, "cyclic refs are fatal";
+    throws_ok { my $data = load_yaml(string => $cyclic) } qr{Found cyclic ref}, "cyclic refs are fatal";
 };
 
 done_testing;

t/30-test_parser.t

@@ -613,10 +613,7 @@ subtest tap_parse_invalid => sub {
 
     my $parser = OpenQA::Parser::Format::TAP->new;
 
-    eval { $parser->load($tap_test_file) };
-    my $error = $@;
-
-    like $error, qr{A valid TAP starts with filename.tap}, "Invalid TAP example";
+    throws_ok { $parser->load($tap_test_file) } qr{A valid TAP starts with filename.tap}, "Invalid TAP example";
 };
 
 sub test_ltp_file {

t/31-client_archive.t

@@ -27,16 +27,16 @@ subtest 'OpenQA::Client:Archive tests' => sub {
     is(-s "$limittest_path/limittest.tar.bz2", 2 * 1024 * 1024, 'limit test file is created')
       or note "dd output: $dd_output";
 
-    eval {
+    throws_ok {
         my %options = (
             archive => $destination,
             url => "/api/v1/jobs/$jobid/details",
             'asset-size-limit' => $limit,
             'with-thumbnails' => 1
         );
         my $command = $t->ua->archive->run(\%options);
-    };
-    is($@, '', 'Archive functionality works as expected would perform correctly') or always_explain $@;
+    }
+    qr//, 'Archive functionality works as expected would perform correctly' or always_explain $@;
 
     my $file = $destination->child('testresults', 'details-zypper_up.json');
     ok(-e $file, 'details-zypper_up.json file exists') or diag $file;

t/32-openqa_client.t

@@ -43,8 +43,10 @@ subtest 'upload public assets' => sub {
     my $chunkdir = 't/data/openqa/share/factory/tmp/public/hdd_image2.qcow2.CHUNKS/';
     my $rp = "t/data/openqa/share/factory/hdd/hdd_image2.qcow2";
 
-    eval { $t->ua->upload->asset(99963 => {chunk_size => $chunk_size, file => $filename, name => 'hdd_image2.qcow2'}); };
-    ok !$@, 'No upload errors' or die explain $@;
+    lives_ok {
+        $t->ua->upload->asset(99963 => {chunk_size => $chunk_size, file => $filename, name => 'hdd_image2.qcow2'})
+    }
+    'No upload errors' or die explain $@;
     path($chunkdir)->remove_tree;
     ok !-d $chunkdir, 'Chunk directory should not exist anymore';
     ok -e $rp, 'Asset exists after upload';
@@ -57,11 +59,11 @@ subtest 'upload public assets (local)' => sub {
     my $chunkdir = 't/data/openqa/share/factory/tmp/public/hdd_image5.qcow2.CHUNKS/';
     my $rp = "t/data/openqa/share/factory/hdd/hdd_image5.qcow2";
 
-    eval {
+    lives_ok {
         $t->ua->upload->asset(
             99963 => {chunk_size => $chunk_size, file => $filename, name => 'hdd_image5.qcow2', local => 1});
-    };
-    ok !$@, 'No upload errors' or die explain $@;
+    }
+    'No upload errors' or die explain $@;
     path($chunkdir)->remove_tree;
     ok !-d $chunkdir, 'Chunk directory should not exist anymore';
     ok -e $rp, 'Asset exists after upload';
@@ -77,11 +79,11 @@ subtest 'upload private assets' => sub {
     my ($local_prepare, $chunk_prepare);
     my $local_prepare_cb = $t->ua->upload->on('upload_local.prepare' => sub { $local_prepare++ });
     my $chunk_prepare_cb = $t->ua->upload->on('upload_chunk.prepare' => sub { $chunk_prepare++ });
-    eval {
+    lives_ok {
         $t->ua->upload->asset(
             99963 => {chunk_size => $chunk_size, file => $filename, name => 'hdd_image3.qcow2', asset => 'private'});
-    };
-    ok !$@, 'No upload errors' or die explain $@;
+    }
+    'No upload errors' or die explain $@;
     $t->ua->upload->unsubscribe('upload_local.prepare' => $local_prepare_cb);
     $t->ua->upload->unsubscribe('upload_chunl.prepare' => $chunk_prepare_cb);
     ok !$local_prepare, 'not uploaded via file copy';
@@ -101,7 +103,7 @@ subtest 'upload private assets (local)' => sub {
     my ($local_prepare, $chunk_prepare);
     my $local_prepare_cb = $t->ua->upload->on('upload_local.prepare' => sub { $local_prepare++ });
     my $chunk_prepare_cb = $t->ua->upload->on('upload_chunk.prepare' => sub { $chunk_prepare++ });
-    eval {
+    lives_ok {
         $t->ua->upload->asset(
             99963 => {
                 chunk_size => $chunk_size,
@@ -110,8 +112,8 @@ subtest 'upload private assets (local)' => sub {
                 asset => 'private',
                 local => 1
             });
-    };
-    ok !$@, 'No upload errors' or die explain $@;
+    }
+    'No upload errors' or die explain $@;
     $t->ua->upload->unsubscribe('upload_local.prepare' => $local_prepare_cb);
     $t->ua->upload->unsubscribe('upload_chunl.prepare' => $chunk_prepare_cb);
     ok $local_prepare, 'uploaded via file copy';
@@ -133,11 +135,11 @@ subtest 'upload other assets' => sub {
             ok(-d $chunkdir, 'Chunk directory exists');
         });
 
-    eval {
+    lives_ok {
         $t->ua->upload->asset(
             99963 => {chunk_size => $chunk_size, file => $filename, name => 'hdd_image3.xml', asset => 'other'});
-    };
-    ok !$@, 'No upload errors' or die explain $@;
+    }
+    'No upload errors' or die explain $@;
     ok !-d $chunkdir, 'Chunk directory should not exist anymore';
     ok -e $rp, 'Asset exists after upload';
     is $sum, OpenQA::File->file_digest($rp), 'checksum matches for other asset';
@@ -160,11 +162,11 @@ subtest 'upload retries' => sub {
     $t->ua->upload->on('upload_chunk.response' => sub { $responses++; });
     $t->ua->upload->on('upload_chunk.request_fail' => sub { use Data::Dump 'pp'; diag pp(@_) });
 
-    eval {
+    lives_ok {
         $t->ua->upload->asset(
             99963 => {chunk_size => $chunk_size, file => $filename, name => 'hdd_image4.xml', asset => 'other'});
-    };
-    ok !$@, 'No upload errors';
+    }
+    'No upload errors';
     is $fail_chunk, 1, 'One chunk failed uploading, but we recovered' or always_explain "\$fail_chunk: $fail_chunk";
     is $responses, OpenQA::File::_chunk_size(-s $filename, $chunk_size) + 1, 'responses as expected';
     ok !-d $chunkdir, 'Chunk directory should not exist anymore';
@@ -191,11 +193,11 @@ subtest 'upload failures' => sub {
             is(pop()->res->json->{status}, 'foobar', 'Error message status is correct');
         });
 
-    eval {
+    lives_ok {
         $t->ua->upload->asset(99963 =>
               {chunk_size => $chunk_size, file => $filename, name => 'hdd_image5.xml', asset => 'other', retries => 7});
-    };
-    ok !$@, 'No function errors on upload failures' or die diag $@;
+    }
+    'No function errors on upload failures' or die diag $@;
     is $fail_chunk, 7, 'All attempts failed, no recovery on upload failures';
     is $errored, 1, 'Upload errors';
     ok !-d $chunkdir, 'Chunk directory should not exist anymore';
@@ -216,11 +218,11 @@ subtest 'upload internal errors' => sub {
     $t->ua->upload->on('upload_chunk.response' => sub { die("Subdly") });
     $t->ua->upload->on('upload_chunk.request_err' => sub { $fail_chunk++; $e = pop(); });
 
-    eval {
+    lives_ok {
         $t->ua->upload->asset(
             99963 => {chunk_size => $chunk_size, file => $filename, name => 'hdd_image6.xml', asset => 'other'});
-    };
-    ok !$@, 'No function errors on internal errors' or die diag $@;
+    }
+    'No function errors on internal errors' or die diag $@;
     is $fail_chunk, 10, 'All chunks failed, no recovery on internal errors';
     like $e, qr/Subdly/, 'Internal error seen';
     ok !-d $chunkdir, 'Chunk directory should not exist anymore';

t/ui/15-comments.t

@@ -301,8 +301,8 @@ subtest 'commenting in test results including labels' => sub {
         my $textarea = $driver->find_element_by_id('text');
         like $textarea->get_value, qr/label:force_result:new_result/, 'label template added';
         $driver->find_element_by_id('submitComment')->click;
-        eval { wait_for_ajax(msg => 'alert when trying to submit comment') };
-        like $@, qr/unexpected alert/, 'alert already shown shown when trying to wait for it' if $@;
+        throws_ok { wait_for_ajax(msg => 'alert when trying to submit comment') } qr/unexpected alert/,
+          'alert already shown shown when trying to wait for it';
         like $driver->get_alert_text, qr/Invalid result 'new_result' for force_result/, 'error from server shown';
         $driver->dismiss_alert;
         $textarea->clear;