Make restart_openqa_job emit event same as API

And create test coverage
- Covers the emission of events on Minion restarts
- Loads the AMQP plugin
- Checks event body for consistency with events from API

issue: https://progress.opensuse.org/issues/190557
Signed-off-by: Ioannis Bonatakis <[email protected]>

Author: d3flex

lib/OpenQA/Task/Job/Restart.pm

@@ -20,7 +20,8 @@ sub restart_openqa_job ($minion_job, $openqa_job) {
     my $is_ok = ref $cloned_job_or_error || $cloned_job_or_error =~ qr/(already.*clone|direct parent)/i;
     if ($is_ok) {
         my $openqa_job_id = $openqa_job->id;
-        my %event_data = (id => $openqa_job_id, result => $cloned_job_or_error, auto => 1);
+        my $result = ref $cloned_job_or_error ? $cloned_job_or_error->{cluster_cloned} : $cloned_job_or_error;
+        my %event_data = (id => $openqa_job_id, result => $result, auto => 1);
         OpenQA::Events->singleton->emit_event('openqa_job_restart', data => \%event_data);
     }
 

t/10-jobs.t

@@ -21,9 +21,9 @@ use Test::MockModule 'strict';
 use Test::Mojo;
 use Test::Output;
 use Test::Warnings qw(:report_warnings warning);
-use Mojo::File 'path';
+use Mojo::File qw(path tempdir);
 use Mojo::JSON qw(decode_json encode_json);
-use OpenQA::Test::Utils qw(perform_minion_jobs);
+use OpenQA::Test::Utils qw(perform_minion_jobs mock_io_loop);
 use OpenQA::Test::TimeLimit '30';
 
 binmode(STDOUT, ':encoding(UTF-8)');
@@ -934,29 +934,63 @@ subtest 'job setting based retriggering' => sub {
 };
 
 subtest 'AMQP event emission for minion restarts' => sub {
-    my $events_module = Test::MockModule->new('OpenQA::Events');
-    my @emitted_events;
-    $events_module->redefine(
-        emit_event => sub ($self, $event_type, %args) {
-            push @emitted_events, {type => $event_type, data => $args{data}};
-            $events_module->original('emit_event')->($self, $event_type, %args);
+    my $plugin_mock = Test::MockModule->new('OpenQA::WebAPI::Plugin::AMQP');
+    my $conf = "[global]\nplugins=AMQP\n[amqp]\npublish_attempts = 2\npublish_retry_delay = 0\n";
+    my $tempdir = tempdir;
+    path($ENV{OPENQA_CONFIG} = $tempdir)->make_path->child('openqa.ini')->spew($conf);
+    my %published;
+    my @event_body;
+    my $io_loop_mock = Test::MockModule->new('Mojo::IOLoop');
+    $io_loop_mock->redefine(start => sub { });
+    $plugin_mock->redefine(
+        publish_amqp => sub ($self, $topic, $data) {
+            $published{$topic} = $data;
+            Mojo::IOLoop->next_tick(
+                sub {
+                    OpenQA::Events->singleton->emit('amqp_handled');
+                });
         });
 
+    my $events_mock = Test::MockModule->new('OpenQA::Events');
+    $events_mock->redefine(
+        emit => sub ($self, $type, $args) {
+            if ($type eq 'openqa_job_restart') {
+                @event_body = ($type, $args);
+            }
+            $events_mock->original('emit')->($self, $type, $args);
+        });
+    # new app otherwise it runs slow. Maybe tries no-mocked stuff
+    my $t = Test::Mojo->new('OpenQA::WebAPI');
     my $minion = $t->app->minion;
+    my $jobs2 = $t->app->schema->resultset('Jobs');
+    is $t->app->config->{amqp}->{enabled}, 1, 'AMQP enabled from config file';
+
     my %_settings = %settings;
-    $_settings{TEST} = 'test_restart';
+    $_settings{TEST} = 'test_amqp_restart';
     $_settings{RETRY} = '1';
-    my $job = _job_create(\%_settings);
+    my $job = $jobs2->create_from_settings(\%_settings);
+    $job->discard_changes;
     my $job_id = $job->id;
 
-    @emitted_events = ();
+    %published = ();
     $job->done(result => FAILED);
     stdout_like { perform_minion_jobs($minion) } qr/Job \d+ duplicated as \d+/;
-    my @restart_events = grep { $_->{type} eq 'openqa_job_restart' } @emitted_events;
+    my $event = OpenQA::Test::Case::find_most_recent_event($schema, 'job_restart');
+    my $expected_topic = 'suse.openqa.job.restart';
+    my @restart_events = grep { $_ eq $expected_topic } keys %published;
+    ok exists $published{$expected_topic}, 'restart event published via AMQP';
+    is $published{$expected_topic}{id}, $job_id, 'event contains original job ID';
+    is $published{$expected_topic}{auto}, 1, 'event marked as auto restart';
     is scalar(@restart_events), 1, 'exactly one job restart event emitted';
-    my $event_data = $restart_events[0]->{data};
-    is $event_data->{id}, $job_id, 'event contains original job ID';
-    ok exists($event_data->{result}), 'event contains result';
+    is $event_body[0], 'openqa_job_restart', 'event type is openqa_job_restart';
+    my ($user_id, $connection, $type, $data) = @{$event_body[1]};
+    is $user_id, undef, 'user_id is undef for Minion restart';
+    is $connection, undef, 'connection is undef for Minion restart';
+    is $type, 'openqa_job_restart', 'type matches event type';
+    is $data->{id}, $job_id, 'data contains original job ID';
+    is $data->{auto}, 1, 'data marked as auto restart';
+    is ref($data->{result}), 'HASH', 'result should be a plain hash like API';
+    is_deeply $data->{result}, {$job_id => $data->{result}{$job_id}}, 'result shows cloned job info';
 };
 
 subtest '"race" between status updates and stale job detection' => sub {