From cc277eaaf8c420df6cabbd930978c39a0790f22f Mon Sep 17 00:00:00 2001
From: Lenka Segura <lsegura@redhat.com>
Date: Thu, 11 Jul 2024 15:09:30 +0200
Subject: [PATCH] koji_retired_packages: fix tests

Signed-off-by: Lenka Segura <lsegura@redhat.com>
---
 tests/plugins/test_koji_block_retired.py | 26 ++++++++++++------------
 toddlers/plugins/koji_block_retired.py   |  4 +++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/plugins/test_koji_block_retired.py b/tests/plugins/test_koji_block_retired.py
index 888d8db..d11406f 100644
--- a/tests/plugins/test_koji_block_retired.py
+++ b/tests/plugins/test_koji_block_retired.py
@@ -3,7 +3,7 @@ Unit tests for `toddler.plugins.koji_block_retired`
 """
 
 import logging
-from unittest import mock
+from unittest.mock import MagicMock
 
 import koji
 import pytest
@@ -56,7 +56,7 @@ class TestProcess:
         config = {"key": "value"}
         message = "Example message"
 
-        self.toddler_cls.process_block_retired = mock.MagicMock()
+        self.toddler_cls.process_block_retired = MagicMock()
         self.toddler_cls.process(config, message)
         self.toddler_cls.process_block_retired.assert_called_once_with(config, message)
 
@@ -70,16 +70,16 @@ class TestProcessBlockRetired:
     def setup_method(self):
         """Initialize toddler."""
         self.toddler_cls = koji_block_retired.KojiBlockRetired()
-        self.toddler_cls.koji_session = mock.MagicMock()
+        self.toddler_cls.koji_session = MagicMock()
 
     def test_no_dead_package_file(self, caplog):
         """
         Assert that if no dead package was added the plugin stops.
         """
         caplog.set_level(logging.INFO)
-        message = mock.MagicMock()
+        message = MagicMock()
         message.body = {"commit": {"stats": {"files": {}}}}
-        config = mock.MagicMock()
+        config = MagicMock()
         config = {"profile": "stg"}
         self.toddler_cls.process_block_retired(config, message)
         assert caplog.records[-1].message == "No dead.package in the commit, bailing"
@@ -89,13 +89,13 @@ class TestProcessBlockRetired:
         Assert if in commit dead package wasn't added the plugin stops.
         """
         caplog.set_level(logging.INFO)
-        message = mock.MagicMock()
+        message = MagicMock()
         message.body = {
             "commit": {
                 "stats": {"files": {"dead.package": {"additions": 0, "deletions": 1}}}
             }
         }
-        config = mock.MagicMock()
+        config = MagicMock()
         config = {"profile": "stg"}
         self.toddler_cls.process_block_retired(config, message)
         assert caplog.records[-1].message == "dead.package file was not added, bailing"
@@ -106,7 +106,7 @@ class TestProcessBlockRetired:
         """
         caplog.set_level(logging.INFO)
 
-        message = mock.MagicMock()
+        message = MagicMock()
         message.body = {
             "commit": {
                 "stats": {"files": {"dead.package": {"additions": 1, "deletions": 0}}},
@@ -115,7 +115,7 @@ class TestProcessBlockRetired:
                 "namespace": "example_ns",
             }
         }
-        config = mock.MagicMock()
+        config = MagicMock()
         config = {"profile": "stg"}
         self.toddler_cls.process_block_retired(config, message)
         self.toddler_cls.koji_session.packageListBlock.assert_called_once_with(
@@ -128,7 +128,7 @@ class TestProcessBlockRetired:
         Assert that method will process correctly with different branches.
         """
         caplog.set_level(logging.INFO)
-        message = mock.MagicMock()
+        message = MagicMock()
         message.body = {
             "commit": {
                 "stats": {"files": {"dead.package": {"additions": 1, "deletions": 0}}},
@@ -137,7 +137,7 @@ class TestProcessBlockRetired:
                 "namespace": "example_ns",
             }
         }
-        config = mock.MagicMock()
+        config = MagicMock()
         config = {"profile": "stg"}
         self.toddler_cls.process_block_retired(config, message)
         self.toddler_cls.koji_session.packageListBlock.assert_called_once_with(
@@ -149,7 +149,7 @@ class TestProcessBlockRetired:
         """
         Assert that Koji generic error will be handled correctly.
         """
-        message = mock.MagicMock()
+        message = MagicMock()
         message.body = {
             "commit": {
                 "stats": {"files": {"dead.package": {"additions": 1, "deletions": 0}}},
@@ -158,7 +158,7 @@ class TestProcessBlockRetired:
                 "namespace": "example_ns",
             }
         }
-        config = mock.MagicMock()
+        config = MagicMock()
         config = {"profile": "stg"}
         self.toddler_cls.koji_session.packageListBlock.side_effect = koji.GenericError(
             "Failed"
diff --git a/toddlers/plugins/koji_block_retired.py b/toddlers/plugins/koji_block_retired.py
index df3aaef..1c470d0 100644
--- a/toddlers/plugins/koji_block_retired.py
+++ b/toddlers/plugins/koji_block_retired.py
@@ -139,7 +139,9 @@ def main(args):
         # Either from a file
         with open(msg_file, "r") as stream:
             msg = json.load(stream)
-        commit_msg = CommitV1(body=msg["body"], headers=msg["headers"], topic=msg["topic"])
+        commit_msg = CommitV1(
+            body=msg["body"], headers=msg["headers"], topic=msg["topic"]
+        )
     else:
         # Or edit this dict to match your needs
         body = {"commit": {"branch": "rawhide", "stats": {"files": {}}}, "repo": "repo"}