Skip to content

Commit

Permalink
Don't change title of the bugzilla ticket when version is not latest
Browse files Browse the repository at this point in the history
Previously we changed the bugzilla ticket title when we received a new version
from Anitya, but this doesn't need to be the latest upstream version all of the
time. So it's better to keep the latest upstream in title instead.

Fixes #533

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
  • Loading branch information
Zlopez committed Mar 8, 2023
1 parent 0182ab2 commit 0abe090
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
18 changes: 5 additions & 13 deletions hotness/hotness_consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -624,19 +624,11 @@ def _comment_on_bugzilla_with_template(
projectid=project_id,
dist_git_url=dist_git_url,
)
if len(retrieved_versions) > 1:
if latest_upstream in retrieved_versions:
short_desc = self.short_desc_template % dict(
name=package.name, retrieved_version=latest_upstream
)
else:
short_desc = self.short_desc_template_more_versions % dict(
name=package.name
)
elif retrieved_versions:
short_desc = self.short_desc_template % dict(
name=package.name, retrieved_version=retrieved_versions[0]
)
# Don't change the title of bug if the new version received is
# older than the latest upstream
short_desc = self.short_desc_template % dict(
name=package.name, retrieved_version=latest_upstream
)
notify_request = NotifyRequest(
package=package,
message=description,
Expand Down
1 change: 1 addition & 0 deletions news/533.bug
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bug title being rewritten when older version is obtained by Anitya and not packaged in Fedora yet
6 changes: 4 additions & 2 deletions tests/test_hotness_consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,9 @@ def test_call_anitya_update_all_versions(self):
@pytest.mark.parametrize(
"test_input,expected",
[
(["0.99.3"], "flatpak-0.99.3 is available"),
(["0.99.3"], "flatpak-1.0.4 is available"),
(["1.0.4"], "flatpak-1.0.4 is available"),
(["1.0.3", "0.99.3"], "New versions of flatpak available."),
(["1.0.3", "0.99.3"], "flatpak-1.0.4 is available"),
],
)
def test_bugzilla_notify_with_retrieved_versions(self, test_input, expected):
Expand All @@ -426,6 +426,8 @@ def test_bugzilla_notify_with_retrieved_versions(self, test_input, expected):
- retrieved_versions and not package.version
- in case package.version is in retrieved_versions use package.version
- in case of more than one item in retrieved_versions use generic message.
- in case the latest upstream is newer than the retrieved version don't
update the header
"""
message = create_message("anitya.project.version.update.v2", "fedora_mapping")
message.body["message"]["upstream_versions"] = test_input
Expand Down

0 comments on commit 0abe090

Please sign in to comment.