From beeb0bd1f53b8a304752f328a7a19f15f3686ac6 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Apr 24 2018 17:08:13 +0000 Subject: More details in state_reason. See also https://github.com/release-engineering/fedmsg_meta_umb/pull/47 --- diff --git a/freshmaker/handlers/brew/container_task_state_change.py b/freshmaker/handlers/brew/container_task_state_change.py index 2dda040..08caa66 100644 --- a/freshmaker/handlers/brew/container_task_state_change.py +++ b/freshmaker/handlers/brew/container_task_state_change.py @@ -132,10 +132,13 @@ class BrewContainerTaskStateChangeHandler(ContainerBuildHandler): if num_failed: db_event.transition( EventState.COMPLETE, - '%d container image(s) failed to rebuild.' % num_failed) + '%d of %d container image(s) failed to rebuild.' % ( + num_failed, len(db_event.builds),)) else: db_event.transition( - EventState.COMPLETE, 'All container images have been rebuilt.') + EventState.COMPLETE, + 'All %s container images have been rebuilt.' % ( + len(db_event.builds),)) def _verify_advisory_rpms_in_container_build(self, errata_id, container_build_id): """ diff --git a/tests/test_brew_container_task_state_change_handler.py b/tests/test_brew_container_task_state_change_handler.py index 1b341a5..6fd15fa 100644 --- a/tests/test_brew_container_task_state_change_handler.py +++ b/tests/test_brew_container_task_state_change_handler.py @@ -148,7 +148,7 @@ class TestBrewContainerTaskStateChangeHandler(helpers.ModelsTestCase): self.assertEqual(EventState.COMPLETE.value, self.db_advisory_rpm_signed_event.state) - self.assertEqual("1 container image(s) failed to rebuild.", + self.assertEqual("1 of 4 container image(s) failed to rebuild.", self.db_advisory_rpm_signed_event.state_reason) @mock.patch('freshmaker.handlers.ContainerBuildHandler.build_image_artifact_build')