From aa9d3b37e4d8468a64494034849fc931fca3caba Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Nov 23 2017 06:54:05 +0000 Subject: Pass models.Event to prepare_pulp_repo method, not BaseEvent --- diff --git a/freshmaker/handlers/errata/errata_advisory_rpms_signed.py b/freshmaker/handlers/errata/errata_advisory_rpms_signed.py index 85286e1..5ebce94 100644 --- a/freshmaker/handlers/errata/errata_advisory_rpms_signed.py +++ b/freshmaker/handlers/errata/errata_advisory_rpms_signed.py @@ -475,7 +475,7 @@ class ErrataAdvisoryRPMsSignedHandler(BaseHandler): build.transition(state, state_reason) - compose = self._prepare_pulp_repo(event, image["content_sets"]) + compose = self._prepare_pulp_repo(build.event, image["content_sets"]) build_args = {} build_args["repository"] = image["repository"] diff --git a/tests/test_errata_advisory_state_changed.py b/tests/test_errata_advisory_state_changed.py index 0c57aa3..d507cad 100644 --- a/tests/test_errata_advisory_state_changed.py +++ b/tests/test_errata_advisory_state_changed.py @@ -24,7 +24,7 @@ import unittest import json -from mock import patch, MagicMock, PropertyMock, Mock +from mock import patch, MagicMock, PropertyMock, Mock, call from freshmaker.handlers.errata import ErrataAdvisoryRPMsSignedHandler from freshmaker.handlers.errata import ErrataAdvisoryStateChangedHandler @@ -976,6 +976,11 @@ class TestRecordBatchesImages(unittest.TestCase): build_args = json.loads(child_image.build_args) self.assertEqual(2, build_args['odcs_pulp_compose_id']) + self.mock_prepare_pulp_repo.assert_has_calls([ + call(child_image.event, ["content-set-1"]), + call(child_image.event, ["content-set-1"]) + ]) + def test_mark_failed_state_if_image_has_error(self): batches = [ [{