Skip to content

Commit 1821d9b

Browse files
committed
Skip upload of test modules and extra tests with no name
Trying to upload those will lead to errors as openQA requires a name. It is probably better to avoid any fatal errors here so the rest of the results can still be uploaded. Related ticket: https://progress.opensuse.org/issues/185497
1 parent a9d64b7 commit 1821d9b

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

lib/OpenQA/Worker/Job.pm

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,24 +1156,25 @@ sub _read_result_file ($self, $upload_up_to, $extra_test_order) {
11561156
my $test_order = $self->test_order;
11571157
my (%ret, $last_test_module);
11581158
return (\%ret, $last_test_module) unless $test_order;
1159+
my $skipped = 0;
11591160
for my $test_module (@$test_order) {
1160-
my $test = $test_module->{name};
1161-
my $result = $self->_read_module_result($test);
1162-
last unless $result;
1161+
++$skipped and next unless my $test = $test_module->{name};
1162+
++$skipped and last unless my $result = $self->_read_module_result($test);
11631163

11641164
$last_test_module = $test;
11651165
$ret{$test} = $result;
11661166
if ($result->{extra_test_results}) {
11671167
for my $extra_test (@{$result->{extra_test_results}}) {
1168-
my $extra_result = $self->_read_module_result($extra_test->{name});
1169-
next unless $extra_result;
1170-
$ret{$extra_test->{name}} = $extra_result;
1168+
++$skipped and next unless my $extra_test_name = $extra_test->{name};
1169+
++$skipped and next unless my $extra_result = $self->_read_module_result($extra_test_name);
1170+
$ret{$extra_test_name} = $extra_result;
11711171
}
11721172
push @{$extra_test_order}, @{$result->{extra_test_results}};
11731173
}
11741174

11751175
last if $test eq $upload_up_to;
11761176
}
1177+
log_debug "Skipped $skipped invalid test modules or extra tests" if $skipped;
11771178
return (\%ret, $last_test_module);
11781179
}
11791180

@@ -1185,7 +1186,7 @@ sub _reduce_test_order ($self, $last_test_module) {
11851186

11861187
my $modules_considered_processed = 0;
11871188
for my $test_module (@$test_order) {
1188-
my $test_name = $test_module->{name};
1189+
next unless my $test_name = $test_module->{name};
11891190
last if $test_name eq $current_test_module;
11901191
++$modules_considered_processed;
11911192
last if $test_name eq $last_test_module;

0 commit comments

Comments
 (0)