Merge pull request #6596 from perlpunk/single-quotes

perlcritic: Use single quotes in test files

Author: mergify[bot]

t/02-pod.t

@@ -3,6 +3,6 @@ use Test::Warnings qw(:no_end_test :report_warnings);
 use Feature::Compat::Try;
 # no OpenQA::Test::TimeLimit for this trivial test
 
-eval 'use Test::Pod; 1' or plan skip_all => "Test::Pod required for testing POD";
+eval 'use Test::Pod; 1' or plan skip_all => 'Test::Pod required for testing POD';
 
 all_pod_files_ok();

t/03-auth-openid.t

@@ -41,7 +41,7 @@ $mock_openid_consumer->redefine(
     'handle_server_response',
     sub ($self, %res_handlers) {
         return $res_handlers{setup_needed}
-          ? $res_handlers{setup_needed}->("https://www.opensuse.org/openid/setup")
+          ? $res_handlers{setup_needed}->('https://www.opensuse.org/openid/setup')
           : undef;
     });
 $c->set_always(

t/04-scheduler.t

@@ -164,13 +164,13 @@ my $job_ref = {
     # to be removed
     test => 'rainbow'
 };
-my $iso = sprintf("%s/iso/%s", assetdir(), $settings{ISO});
+my $iso = sprintf('%s/iso/%s', assetdir(), $settings{ISO});
 my $job = $jobs->create_from_settings(\%settings);
-is($job->id, 1, "job_create");
+is($job->id, 1, 'job_create');
 
 my %settings2 = %settings;
-$settings2{NAME} = "OTHER NAME";
-$settings2{BUILD} = "44";
+$settings2{NAME} = 'OTHER NAME';
+$settings2{BUILD} = '44';
 my $job2 = $jobs->create_from_settings(\%settings2);
 is($job2->id, 2);
 
@@ -182,7 +182,7 @@ subtest 'calling again with same settings' => sub {
 
 $job->set_prio(40);
 my $new_job = job_get_hash($job->id);
-is_deeply($new_job, $job_ref, "job_get");
+is_deeply($new_job, $job_ref, 'job_get');
 
 subtest 'job listing' => sub {
     my $expected_jobs = [
@@ -247,43 +247,43 @@ subtest 'job listing' => sub {
     ];
 
     $current_jobs = list_jobs();
-    is_deeply($current_jobs, $expected_jobs, "All list_jobs");
+    is_deeply($current_jobs, $expected_jobs, 'All list_jobs');
 
     my %args = (state => SCHEDULED);
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, $expected_jobs, "All list_jobs with state scheduled");
+    is_deeply($current_jobs, $expected_jobs, 'All list_jobs with state scheduled');
 
     %args = (state => RUNNING);
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, [], "All list_jobs with state running");
+    is_deeply($current_jobs, [], 'All list_jobs with state running');
 
-    %args = (build => "666");
+    %args = (build => '666');
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, [$expected_jobs->[1]], "list_jobs with build");
+    is_deeply($current_jobs, [$expected_jobs->[1]], 'list_jobs with build');
 
-    %args = (iso => "whatever.iso");
+    %args = (iso => 'whatever.iso');
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, $expected_jobs, "list_jobs with iso");
+    is_deeply($current_jobs, $expected_jobs, 'list_jobs with iso');
 
-    %args = (build => "666", state => SCHEDULED);
+    %args = (build => '666', state => SCHEDULED);
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, [$expected_jobs->[1]], "list_jobs combining a setting (BUILD) and state");
+    is_deeply($current_jobs, [$expected_jobs->[1]], 'list_jobs combining a setting (BUILD) and state');
 
-    %args = (iso => "whatever.iso", build => "666");
+    %args = (iso => 'whatever.iso', build => '666');
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, [$expected_jobs->[1]], "list_jobs combining two settings (ISO and BUILD)");
+    is_deeply($current_jobs, [$expected_jobs->[1]], 'list_jobs combining two settings (ISO and BUILD)');
 
-    %args = (build => "whatever.iso", iso => "666");
+    %args = (build => 'whatever.iso', iso => '666');
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, [], "list_jobs messing two settings up");
+    is_deeply($current_jobs, [], 'list_jobs messing two settings up');
 
     %args = (ids => [1, 2], state => [SCHEDULED, DONE]);
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, $expected_jobs, "jobs with specified IDs and states (array ref)");
+    is_deeply($current_jobs, $expected_jobs, 'jobs with specified IDs and states (array ref)');
 
-    %args = (ids => "2,3", state => "scheduled,done");
+    %args = (ids => '2,3', state => 'scheduled,done');
     $current_jobs = list_jobs(%args);
-    is_deeply($current_jobs, [$expected_jobs->[0]], "jobs with specified IDs (comma list)");
+    is_deeply($current_jobs, [$expected_jobs->[0]], 'jobs with specified IDs (comma list)');
 };
 
 # assume the worker has just been seen
@@ -452,7 +452,7 @@ subtest 'worker re-registration' => sub {
     $job_ref->{settings}->{JOBTOKEN} = $grabbed->{settings}->{JOBTOKEN};
     $job_ref->{settings}->{NAME} = $grabbed->{settings}->{NAME};
 
-    is_deeply($grabbed->{settings}, $job_ref->{settings}, "settings correct");
+    is_deeply($grabbed->{settings}, $job_ref->{settings}, 'settings correct');
     $job3_id = $job->id;
     $job_id = $grabbed->{id};
 };
@@ -467,7 +467,7 @@ subtest 'setting job to done' => sub {
     ok(!$job->settings_hash->{JOBTOKEN}, 'job token not present after job done');
 
     $current_jobs = list_jobs(result => PASSED);
-    is(scalar @{$current_jobs}, 1, "there is one passed job listed");
+    is(scalar @{$current_jobs}, 1, 'there is one passed job listed');
 };
 
 subtest 'set_prio' => sub {

t/05-scheduler-cancel.t

@@ -33,7 +33,7 @@ embed_server_for_testing(
 sub job_get {
     my ($id) = @_;
 
-    my $job = $schema->resultset("Jobs")->find({id => $id});
+    my $job = $schema->resultset('Jobs')->find({id => $id});
     return $job;
 }
 
@@ -64,12 +64,12 @@ is_deeply(
             parallel_parents => [99961],
         },
     },
-    "99963 is part of a duett"
+    '99963 is part of a duett'
 );
 my $new_job = $job->auto_duplicate;
-ok($new_job, "got new job id " . $new_job->id);
+ok($new_job, 'got new job id ' . $new_job->id);
 
-is($new_job->state, 'scheduled', "new job is scheduled");
+is($new_job->state, 'scheduled', 'new job is scheduled');
 is_deeply(
     $new_job->cluster_jobs,
     {
@@ -96,12 +96,12 @@ is_deeply(
             parallel_parents => [99982],
         },
     },
-    "new job is part of a new duett"
+    'new job is part of a new duett'
 );
 
 $job = job_get(99963);
-is($job->state, 'running', "old job is running");
-is($job->t_finished, undef, "There is a no finish time yet");
+is($job->state, 'running', 'old job is running');
+is($job->t_finished, undef, 'There is a no finish time yet');
 
 sub lj {
     # check the call succeeds every time, only output if verbose
@@ -131,57 +131,57 @@ is $job->reason, 'cancelled by scheduled product 42', 'jobs cancellation reason
 lj;
 
 $job = $new_job->discard_changes;
-is($job->state, 'cancelled', "new job is cancelled");
-ok($job->t_finished, "There is a finish time");
+is($job->state, 'cancelled', 'new job is cancelled');
+ok($job->t_finished, 'There is a finish time');
 
 $job = job_get(99963);
-is($job->state, 'cancelled', "old job cancelled as well");
+is($job->state, 'cancelled', 'old job cancelled as well');
 
 $job = job_get(99982);
-is($job->state, 'cancelled', "new job 99982 cancelled");
+is($job->state, 'cancelled', 'new job 99982 cancelled');
 
 $job = job_get(99983);
-is($job->state, 'cancelled', "new job 99983 cancelled");
+is($job->state, 'cancelled', 'new job 99983 cancelled');
 
 $job = job_get(99928);
-is($job->state, 'scheduled', "unrelated job 99928 still scheduled");
+is($job->state, 'scheduled', 'unrelated job 99928 still scheduled');
 $job = job_get(99927);
-is($job->state, 'scheduled', "unrelated job 99927 still scheduled");
+is($job->state, 'scheduled', 'unrelated job 99927 still scheduled');
 
 $job = job_get(99928);
 $ret = $job->cancel(USER_CANCELLED);
-is($ret, 1, "one job cancelled by id");
+is($ret, 1, 'one job cancelled by id');
 
 $job = job_get(99928);
-is($job->state, 'cancelled', "job 99928 cancelled");
+is($job->state, 'cancelled', 'job 99928 cancelled');
 $job = job_get(99927);
-is($job->state, 'scheduled', "unrelated job 99927 still scheduled");
+is($job->state, 'scheduled', 'unrelated job 99927 still scheduled');
 
 
 $new_job = job_get(99981)->auto_duplicate;
-ok($new_job, "duplicate new job for iso test");
+ok($new_job, 'duplicate new job for iso test');
 
 $job = $new_job;
-is($job->state, 'scheduled', "new job is scheduled");
+is($job->state, 'scheduled', 'new job is scheduled');
 
 lj;
 
 $form = {ISO => 'openSUSE-13.1-GNOME-Live-i686-Build0091-Media.iso'};
 $ret = $schema->resultset('Jobs')->cancel_by_settings($form);
-is($ret, 1, "one job cancelled by iso");
+is($ret, 1, 'one job cancelled by iso');
 is_deeply(OpenQA::Test::Case::find_most_recent_event($schema, 'job_cancel_by_settings'),
     $form, 'Cancellation was logged with settings');
 
 $job = job_get(99927);
-is($job->state, 'scheduled', "unrelated job 99927 still scheduled");
+is($job->state, 'scheduled', 'unrelated job 99927 still scheduled');
 
 my %settings = (
     DISTRI => 'Unicorn',
     FLAVOR => 'pink',
     VERSION => '42',
     BUILD => '666',
     ISO => 'whatever.iso',
-    MACHINE => "RainbowPC",
+    MACHINE => 'RainbowPC',
     ARCH => 'x86_64',
 );
 

t/05-scheduler-capabilities.t

@@ -59,7 +59,7 @@ my %settings = (
     DESKTOP => 'DESKTOP',
     KVM => 'KVM',
     ISO_MAXSIZE => 1,
-    MACHINE => "RainbowPC",
+    MACHINE => 'RainbowPC',
     ARCH => 'x86_64'
 );
 
@@ -159,15 +159,15 @@ $jobI->set_prio(10);
 $jobJ->set_prio(9);
 
 my $c = OpenQA::WebAPI::Controller::API::V1::Worker->new;
-my $w1_id = $c->_register($schema, "host", "1", \%workercaps64_client);
-my $w2_id = $c->_register($schema, "host", "2", \%workercaps64_server);
-my $w3_id = $c->_register($schema, "host", "3", \%workercaps32);
-my $w4_id = $c->_register($schema, "host", "4", \%workercaps64);
-my $w5_id = $c->_register($schema, "host", "5", \%workercaps64_client);
-my $w6_id = $c->_register($schema, "host", "6", \%workercaps64);
-my $w7_id = $c->_register($schema, "host", "7", \%workercaps64_server);
-my $w8_id = $c->_register($schema, "host", "8", \%workercaps64);
-my $w9_id = $c->_register($schema, "host", "9", \%workercaps64_client);
+my $w1_id = $c->_register($schema, 'host', '1', \%workercaps64_client);
+my $w2_id = $c->_register($schema, 'host', '2', \%workercaps64_server);
+my $w3_id = $c->_register($schema, 'host', '3', \%workercaps32);
+my $w4_id = $c->_register($schema, 'host', '4', \%workercaps64);
+my $w5_id = $c->_register($schema, 'host', '5', \%workercaps64_client);
+my $w6_id = $c->_register($schema, 'host', '6', \%workercaps64);
+my $w7_id = $c->_register($schema, 'host', '7', \%workercaps64_server);
+my $w8_id = $c->_register($schema, 'host', '8', \%workercaps64);
+my $w9_id = $c->_register($schema, 'host', '9', \%workercaps64_client);
 
 schedule() for ($jobA, $jobB, $jobE, $jobF, $jobD, $jobC, $jobH, $jobJ, $jobI);
 ok exists $sent->{job}->{$_}, "$_ exists"
@@ -180,27 +180,27 @@ $job = $sent->{$w2_id}->{job}->to_hash;
 is($job->{id}, $jobB->id, "'server' job for 'server' worker");
 
 $job = $sent->{$w3_id}->{job}->to_hash;
-is($job->{id}, $jobE->id, "32bit worker gets 32bit job with highest prio");
+is($job->{id}, $jobE->id, '32bit worker gets 32bit job with highest prio');
 
 $job = $sent->{$w4_id}->{job}->to_hash;
-is($job->{id}, $jobF->id, "next job by prio");
+is($job->{id}, $jobF->id, 'next job by prio');
 
 $job = $sent->{$w5_id}->{job}->to_hash;
 is($job->{id}, $jobD->id, "next job by prio, 'client' worker can do jobs without class");
 
 $job = $sent->{$w6_id}->{job}->to_hash;
-is($job->{id}, $jobC->id, "next job by prio, 64bit worker can get 32bit job");
+is($job->{id}, $jobC->id, 'next job by prio, 64bit worker can get 32bit job');
 
 $job = $sent->{$w7_id}->{job}->to_hash;
-is($job->{id}, $jobH->id, "next job by prio, parent - server");
+is($job->{id}, $jobH->id, 'next job by prio, parent - server');
 
 $job = $sent->{$w8_id}->{job}->to_hash;
 is($job->{id}, $jobJ->id,
 "I is a scheduled child of running H so it should have the highest prio, but this worker can't do it because of class -> take next job by prio instead"
 );
 
 $job = $sent->{$w9_id}->{job}->to_hash;
-is($job->{id}, $jobI->id, "this worker can do jobI, child - client");
+is($job->{id}, $jobI->id, 'this worker can do jobI, child - client');
 
 # job G is not grabbed because there is no worker with class 'special'
 

t/05-scheduler-dependencies.t

@@ -453,19 +453,19 @@ subtest 'clone and schedule parallel cluster' => sub {
     # now free two of them and create one more worker. So that we
     # have 6 free, but have vlan 1 still busy
     $_->done(result => PASSED) for ($jobC, $jobF);
-    $c->_register($schema, 'host', "10", \%workercaps);
+    $c->_register($schema, 'host', '10', \%workercaps);
     _schedule();
 
     ok(exists $sent->{job}->{$jobA2}, " $jobA2 was assigned") or die "A2 $jobA2 wasn't scheduled";
     $job = $sent->{job}->{$jobA2}->{jobhash};
-    is($job->{id}, $jobA2, "jobA2");    # lowest prio of jobs without parents
-    is($job->{settings}->{NICVLAN}, 2, "different vlan") or die explain $job;
+    is($job->{id}, $jobA2, 'jobA2');    # lowest prio of jobs without parents
+    is($job->{settings}->{NICVLAN}, 2, 'different vlan') or die explain $job;
 
     ok(exists $sent->{job}->{$jobB2}, " $jobB2 was assigned") or die "B2 $jobB2 wasn't scheduled";
     $job = $sent->{job}->{$jobB2}->{job}->to_hash;
-    is($job->{id}, $jobB2, "jobB2");    # lowest prio of jobs without parents
+    is($job->{id}, $jobB2, 'jobB2');    # lowest prio of jobs without parents
 
-    is($job->{settings}->{NICVLAN}, 2, "different vlan") or die explain $job;
+    is($job->{settings}->{NICVLAN}, 2, 'different vlan') or die explain $job;
 
     $jobB->done(result => PASSED);
     $jobs->find($_)->done(result => PASSED) for ($jobA2, $jobB2, $jobC2, $jobD2, $jobE2, $jobF2);
@@ -506,12 +506,12 @@ subtest 'simple chained dependency cloning' => sub {
     is($jobY->state, CANCELLED, 'jobY was cancelled');
     is($jobY->result, SKIPPED, 'jobY was skipped');
     my $jobY2 = $jobY->clone;
-    ok(defined $jobY2, "jobY was cloned too");
-    is($jobY2->blocked_by_id, $jobX2->id, "JobY2 is blocked");
+    ok(defined $jobY2, 'jobY was cloned too');
+    is($jobY2->blocked_by_id, $jobX2->id, 'JobY2 is blocked');
     is_deeply(
         $jobY2->to_hash(deps => 1)->{parents},
         {Chained => [$jobX2->id], Parallel => [], 'Directly chained' => []},
-        "JobY parents fit"
+        'JobY parents fit'
     );
     is($jobX2->id, $jobY2->parents->single->parent_job_id, 'jobY2 parent is now jobX clone');
     is($jobX2->clone, undef, 'no clone');
@@ -712,7 +712,7 @@ subtest 'duplicate parallel parent in tree with all dependency types' => sub {
       or always_explain \@sorted_got;
 
     # check chained parents
-    @sorted_got = sort(@{$jobTA2->{parents}->{'Chained'}});
+    @sorted_got = sort(@{$jobTA2->{parents}->{Chained}});
     @sorted_exp = sort(());
     is_deeply(\@sorted_got, \@sorted_exp, 'jobTA2 not regularly chained after jobQ') or always_explain \@sorted_got;
 
@@ -883,7 +883,7 @@ subtest 'clone chained child with siblings; then clone chained parent' =>
 
     # clone A
     $jobA->discard_changes;
-    ok(!$jobA->clone, "jobA not yet cloned");
+    ok(!$jobA->clone, 'jobA not yet cloned');
     my $jobA2 = $jobA->auto_duplicate;
     ok($jobA2, 'jobA duplicated');
     $jobA->discard_changes;
@@ -954,7 +954,7 @@ subtest 'clone chained parent while children are running' => sub {
     $jobA2->state(RUNNING);
     $jobA2->update;
     my $jobA3 = $jobA2->auto_duplicate;
-    ok($jobA3, "cloned A2");
+    ok($jobA3, 'cloned A2');
     $_->discard_changes for ($jobA, $jobB, $jobC, $jobD);
 
     # check all children were cloned anymore and has $jobA3 as parent