From 0ad94492fc4dce36ad0fc2f9b892248ebbea18d0 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Jan 22 2019 12:13:58 +0000
Subject: Allow running Bob handler as result of manual event to test it out.


---

diff --git a/freshmaker/handlers/bob/rebuild_images_on_image_advisory_change.py b/freshmaker/handlers/bob/rebuild_images_on_image_advisory_change.py
index 39822cf..003bf34 100644
--- a/freshmaker/handlers/bob/rebuild_images_on_image_advisory_change.py
+++ b/freshmaker/handlers/bob/rebuild_images_on_image_advisory_change.py
@@ -27,7 +27,8 @@ from freshmaker import conf, db
 from freshmaker.models import Event
 from freshmaker.errata import Errata
 from freshmaker.pulp import Pulp
-from freshmaker.events import ErrataAdvisoryStateChangedEvent
+from freshmaker.events import (ErrataAdvisoryStateChangedEvent,
+                               ManualRebuildWithAdvisoryEvent)
 from freshmaker.handlers import ContainerBuildHandler, fail_event_on_handler_exception
 from freshmaker.types import EventState
 
@@ -36,7 +37,8 @@ class RebuildImagesOnImageAdvisoryChange(ContainerBuildHandler):
     name = 'RebuildImagesOnImageAdvisoryChange'
 
     def can_handle(self, event):
-        if not isinstance(event, ErrataAdvisoryStateChangedEvent):
+        if (not isinstance(event, ErrataAdvisoryStateChangedEvent) and
+                not isinstance(event, ManualRebuildWithAdvisoryEvent)):
             return False
 
         if 'docker' not in event.advisory.content_types:
diff --git a/tests/handlers/bob/test_rebuild_images_on_image_advisory_change.py b/tests/handlers/bob/test_rebuild_images_on_image_advisory_change.py
index 3dd6357..5f79d88 100644
--- a/tests/handlers/bob/test_rebuild_images_on_image_advisory_change.py
+++ b/tests/handlers/bob/test_rebuild_images_on_image_advisory_change.py
@@ -24,7 +24,8 @@ from mock import patch, MagicMock, call
 
 import freshmaker
 from freshmaker.errata import ErrataAdvisory
-from freshmaker.events import ErrataAdvisoryStateChangedEvent
+from freshmaker.events import (ErrataAdvisoryStateChangedEvent,
+                               ManualRebuildWithAdvisoryEvent)
 from freshmaker.handlers.bob import RebuildImagesOnImageAdvisoryChange
 from tests import helpers
 
@@ -47,6 +48,16 @@ class RebuildImagesOnImageAdvisoryChangeTest(helpers.ModelsTestCase):
         ret = self.handler.can_handle(self.event)
         self.assertTrue(ret)
 
+    def test_can_handle_manual_event(self):
+        event = ManualRebuildWithAdvisoryEvent(
+            "123",
+            ErrataAdvisory(123, "RHBA-2017", "SHIPPED_LIVE", ["docker"],
+                           security_impact="",
+                           product_short_name="product"),
+            [])
+        ret = self.handler.can_handle(event)
+        self.assertTrue(ret)
+
     def test_can_handle_non_docker_advisory(self):
         self.event.advisory.content_types = ["rpm"]
         ret = self.handler.can_handle(self.event)
@@ -85,8 +96,8 @@ class RebuildImagesOnImageAdvisoryChangeTest(helpers.ModelsTestCase):
         self.handler.rebuild_images_depending_on_advisory(self.db_event, 123)
 
         get_docker_repo_tags.assert_called_once_with(123)
-        get_docker_repository_name.assert_has_calls([
-            call("bar-526"), call("foo-526")])
+        get_docker_repository_name.assert_any_call("bar-526")
+        get_docker_repository_name.assert_any_call("foo-526")
         requests_get.assert_any_call(
             'http://localhost/update_children/scl/foo-526',
             headers={'Authorization': 'Bearer x'})