diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2020-01-27 13:12:36 -0800 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2020-01-27 13:13:19 -0800 |
commit | c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c (patch) | |
tree | 8bd404f3de72b7275d531997a130a971db52f8e8 /xt | |
parent | Merge commit '7f3a749d7bd78a3e4aee163f562d7e95b0954b44' into bugstest (diff) | |
parent | bump version and add release notes for 5.0.6 (diff) | |
download | bugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.tar.gz bugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.tar.bz2 bugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.zip |
Merge tag 'release-5.0.6' into bugstest
Merge upstream 5.0.6 release, now without conflicts after the
problematic code reformatting change.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'xt')
-rw-r--r-- | xt/lib/Bugzilla/Test/Search.pm | 20 | ||||
-rw-r--r-- | xt/lib/Bugzilla/Test/Search/Constants.pm | 6 | ||||
-rw-r--r-- | xt/lib/Bugzilla/Test/Search/CustomTest.pm | 2 | ||||
-rw-r--r-- | xt/lib/Bugzilla/Test/Search/FieldTest.pm | 10 | ||||
-rw-r--r-- | xt/lib/Bugzilla/Test/Search/OrTest.pm | 2 |
5 files changed, 18 insertions, 22 deletions
diff --git a/xt/lib/Bugzilla/Test/Search.pm b/xt/lib/Bugzilla/Test/Search.pm index 9a445aff7..31ba8bea3 100644 --- a/xt/lib/Bugzilla/Test/Search.pm +++ b/xt/lib/Bugzilla/Test/Search.pm @@ -481,7 +481,7 @@ sub _create_field_values { foreach my $field (@multi_selects) { my $new_value = create_legal_value($field, 6); - my $name = $field->name; + my $name = $field->name; $values{$name} = [$values{$name}, $new_value->name]; } push(@{$values{'tag'}}, "6-tag-" . random()); @@ -602,7 +602,7 @@ sub _create_one_bug { # We need bug 6 to have a unique alias that is not a clone of bug 1's, # so we get the alias separately from the other parameters. - my $alias = $self->bug_create_value($number, 'alias'); + my $alias = $self->bug_create_value($number, 'alias'); my $update_alias = $self->bug_update_value($number, 'alias'); # Otherwise, make bug 6 a clone of bug 1. @@ -630,11 +630,9 @@ sub _create_one_bug { # These are necessary for the changedfrom tests. my $extra_values = $self->_extra_bug_create_values->{$number}; - foreach my $field ( - qw(comments remaining_time percentage_complete + foreach my $field (qw(comments remaining_time percentage_complete keyword_objects everconfirmed dependson blocked - groups_in classification actual_time) - ) + groups_in classification actual_time)) { $extra_values->{$field} = $bug->$field; } @@ -670,7 +668,7 @@ sub _create_one_bug { # writing this test, Bug->create doesn't support setting resolution). # # Same for see_also. - my $timestamp = timestamp($number, $number - 1); + my $timestamp = timestamp($number, $number - 1); my $creation_ts = $timestamp->ymd . ' ' . $timestamp->hms; $bug->{creation_ts} = $creation_ts; $dbh->do('UPDATE longdescs SET bug_when = ? WHERE bug_id = ?', @@ -743,8 +741,8 @@ sub _create_one_bug { $update_params{cc} = {add => \@cc_add, remove => \@cc_remove}; my $see_also_remove = $bug->see_also; my $see_also_add = [$update_params{see_also}]; - $update_params{see_also} = {add => $see_also_add, remove => $see_also_remove}; - $update_params{comment} = {body => $update_params{comment}}; + $update_params{see_also} = {add => $see_also_add, remove => $see_also_remove}; + $update_params{comment} = {body => $update_params{comment}}; $update_params{work_time} = $number; # Setting work_time kills the remaining_time, so we need to @@ -937,7 +935,7 @@ sub run { } # Rollbacks won't get rid of bugs_fulltext entries, so we do that ourselves. - my @bug_ids = map { $_->id } $self->bugs; + my @bug_ids = map { $_->id } $self->bugs; my $bug_id_string = join(',', @bug_ids); $dbh->do("DELETE FROM bugs_fulltext WHERE bug_id IN ($bug_id_string)"); $dbh->bz_rollback_transaction(); @@ -962,7 +960,7 @@ sub _setup_dependencies { my $bug2 = $self->bug(2); my $bug3 = $self->bug(3); foreach my $number (1, 6) { - my $bug = $self->bug($number); + my $bug = $self->bug($number); my @original_delta = ($bug2->delta_ts, $bug3->delta_ts); Bugzilla->set_user($bug->reporter); $bug->set_dependencies([$bug2->id], [$bug3->id]); diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm index 5ff9bd4a9..84080cfe8 100644 --- a/xt/lib/Bugzilla/Test/Search/Constants.pm +++ b/xt/lib/Bugzilla/Test/Search/Constants.pm @@ -957,13 +957,11 @@ use constant INJECTION_BROKEN_FIELD => { 'longdescs.count' => { search => 1, db_skip => ['Pg'], - operator_ok => [ - qw(allwords allwordssubstr anywordssubstr casesubstring + operator_ok => [qw(allwords allwordssubstr anywordssubstr casesubstring changedbefore changedafter greaterthan greaterthaneq lessthan lessthaneq notregexp notsubstring nowordssubstr regexp substring anywords - notequals nowords equals anyexact) - ], + notequals nowords equals anyexact)], }, }; diff --git a/xt/lib/Bugzilla/Test/Search/CustomTest.pm b/xt/lib/Bugzilla/Test/Search/CustomTest.pm index 7423ae367..7455d4828 100644 --- a/xt/lib/Bugzilla/Test/Search/CustomTest.pm +++ b/xt/lib/Bugzilla/Test/Search/CustomTest.pm @@ -70,7 +70,7 @@ sub invalid_field_operator_combination { return undef } sub search_params { my ($self) = @_; - my %params = %{$self->test->{top_params} || {}}; + my %params = %{$self->test->{top_params} || {}}; my $counter = 0; foreach my $row (@{$self->test->{params}}) { $row->{v} = $self->translate_value($row) if exists $row->{v}; diff --git a/xt/lib/Bugzilla/Test/Search/FieldTest.pm b/xt/lib/Bugzilla/Test/Search/FieldTest.pm index 19ceb8d5c..2ccaab735 100644 --- a/xt/lib/Bugzilla/Test/Search/FieldTest.pm +++ b/xt/lib/Bugzilla/Test/Search/FieldTest.pm @@ -158,7 +158,7 @@ sub translated_value { sub debug_fail { my ($self, $number, $results, $sql) = @_; my @expected = @{$self->test->{contains}}; - my @results = sort map { $self->number($_) } map { $_->[0] } @$results; + my @results = sort map { $self->number($_) } map { $_->[0] } @$results; return " Value: '" . $self->translated_value . "'\n" @@ -354,7 +354,7 @@ sub _field_values_for_bug { if ($field =~ /^attach.+\.(.+)$/) { my $attach_field = $1; $attach_field = ATTACHMENT_FIELDS->{$attach_field} || $attach_field; - @values = $self->_values_for($number, 'attachments', $attach_field); + @values = $self->_values_for($number, 'attachments', $attach_field); } elsif (my $flag_field = FLAG_FIELDS->{$field}) { @values = $self->_values_for($number, 'flags', $flag_field); @@ -410,7 +410,7 @@ sub _field_values_for_bug { # requestees.login_name is empty for most bugs (but checking # blessed(undef) handles that. # Values that come from %original_values aren't User objects. - @values = map { blessed($_) ? $_->login : $_ } @values; + @values = map { blessed($_) ? $_->login : $_ } @values; @values = grep { defined $_ } @values; } @@ -503,7 +503,7 @@ sub _translate_value_for_bug { } if (my $func = $self->test->{transform}) { my $transformed = $func->(@bug_values); - my $is_equal = $transformed eq $bug_values[0] ? 1 : 0; + my $is_equal = $transformed eq $bug_values[0] ? 1 : 0; $self->transformed_value_was_equal($number, $is_equal); $string_value = $transformed; } @@ -619,7 +619,7 @@ sub _test_content_for_bug { my $contains_known_broken = $self->contains_known_broken($number); my %result_ids = map { $_->[0] => 1 } @$results; - my $bug_id = $self->bug($number)->id; + my $bug_id = $self->bug($number)->id; TODO: { local $TODO = $contains_known_broken if $contains_known_broken; diff --git a/xt/lib/Bugzilla/Test/Search/OrTest.pm b/xt/lib/Bugzilla/Test/Search/OrTest.pm index 32af7dac4..ebb16089d 100644 --- a/xt/lib/Bugzilla/Test/Search/OrTest.pm +++ b/xt/lib/Bugzilla/Test/Search/OrTest.pm @@ -21,7 +21,7 @@ use constant type => 'OR'; sub new { my $class = shift; - my $self = {field_tests => [@_]}; + my $self = {field_tests => [@_]}; return bless $self, $class; } |