Merge lp:~robru/cupstream2distro/include-summary-in-status-log into lp:cupstream2distro

[Robert Bruce Park]

Show silo summary in status log.

[Robert Bruce Park (robru)]

Looks good in staging.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1230
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/915/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/915/rebuild

review: Approve (continuous-integration)

=== modified file 'citrain/recipes/base.py'
--- citrain/recipes/base.py	2015-11-20 08:18:54 +0000
+++ citrain/recipes/base.py	2015-11-20 19:02:24 +0000
@@ -360,8 +360,8 @@
         """
         BuildBase.validate_packages_to_rebuild(silo_state.all_projects)
         BuildBase.validate_twin_packages(silo_state.all_projects)
-        silo_state.status = 'Landing request verified.'
-        logging.info(silo_state.summarize())
+        logging.info('Landing request verified.')
+        logging.info(silo_state.summarize(status=False))
 
     @staticmethod
     def pre_clean_phase(silo_state):

=== modified file 'citrain/status.py'
--- citrain/status.py	2015-11-20 18:42:20 +0000
+++ citrain/status.py	2015-11-20 19:02:24 +0000
@@ -43,7 +43,7 @@
     CITrainError.prefix = 'Setting status failed: '
     silo_state.lock_fd.close()
     BuildBase.failures.clear()
-    logging.info('Inspecting PPA %s:', silo_state.ppa.web_link)
+    logging.info(silo_state.summarize(status=False))
     status = silo_state.status = Manager(silo_state).get_states()
     if SUCCESS.match(status):
         logging.info('Looks good, proceeding with merge & clean.')

=== modified file 'cupstream2distro/silomanager.py'
--- cupstream2distro/silomanager.py	2015-11-20 08:18:54 +0000
+++ cupstream2distro/silomanager.py	2015-11-20 19:02:24 +0000
@@ -320,7 +320,7 @@
         return set(
             WORD.split('{} {}'.format(self.status, self.qa_signoff).lower()))
 
-    def summarize(self):
+    def summarize(self, status=True):
         """Return a handy summary."""
         joburl = '{}job/{}-{{}}/build'.format(
             env.JENKINS_URL, self.siloname.replace('/', '-'))
@@ -339,7 +339,7 @@
                  for name in self.all_projects]),
             series=self.series.name,
             job_log=self.job_log,
-            status=self.status,
+            status=self.status if status else 'Silo summary:',
             request_url=self.request_url,
             ppa_link=self.ppa.web_link,
         ).replace('api.launchpad.net/devel', 'launchpad.net')

=== modified file 'tests/unit/test_recipe_base.py'
--- tests/unit/test_recipe_base.py	2015-11-20 08:18:54 +0000
+++ tests/unit/test_recipe_base.py	2015-11-20 19:02:24 +0000
@@ -253,7 +253,7 @@
         BuildBase.post_validate_phase(silo_state)
         twin_mock.assert_called_once_with(silo_state.all_projects)
         rebuild_mock.assert_called_once_with(silo_state.all_projects)
-        silo_state.summarize.assert_called_once_with()
+        silo_state.summarize.assert_called_once_with(status=False)
 
     def test_pre_clean_phase(self):
         """Set correct silo state."""

=== modified file 'tests/unit/test_script_status.py'
--- tests/unit/test_script_status.py	2015-11-20 11:05:30 +0000
+++ tests/unit/test_script_status.py	2015-11-20 19:02:24 +0000
@@ -63,6 +63,7 @@
         self.assertIsNone(self.script.update_status(silo_state))
         self.assertEqual(silo_state.mock_calls, [
             call.lock_fd.close(),
+            call.summarize(status=False),
         ])
         self.assertEqual(self.script.Manager.mock_calls, [
             call(silo_state),