Merge lp:~zyga/checkbox/fix-1297118 into lp:checkbox

[Zygmunt Krynicki]

450217b plainbox:job: fix tr_summary() if summary is not present
17f367e plainbox:job: fix docstring

[Daniel Manrique (roadmr)]

Looks OK, thanks

review: Approve

=== modified file 'plainbox/plainbox/impl/job.py'
--- plainbox/plainbox/impl/job.py	2014-03-24 12:33:35 +0000
+++ plainbox/plainbox/impl/job.py	2014-03-27 13:58:13 +0000
@@ -261,7 +261,7 @@
         Get the translated version of :meth:`summary`
         """
         return self.get_normalized_translated_data(
-            self.get_raw_record_value('summary'))
+            self.get_raw_record_value('summary')) or self.id
 
     @property
     def name(self):

=== modified file 'plainbox/plainbox/impl/test_job.py'
--- plainbox/plainbox/impl/test_job.py	2014-03-21 21:34:00 +0000
+++ plainbox/plainbox/impl/test_job.py	2014-03-27 13:58:13 +0000
@@ -488,7 +488,7 @@
 
     def test_tr_summary(self):
         """
-        Verify that Provider1.tr_description() works as expected
+        Verify that Provider1.tr_summary() works as expected
         """
         job = JobDefinition(self._full_record.data)
         with mock.patch.object(job, "get_normalized_translated_data") as mgntd:
@@ -498,6 +498,14 @@
         # Ensure tr_summary() returned its return value
         self.assertEqual(retval, mgntd())
 
+    def test_tr_summary__falls_back_to_id(self):
+        """
+        Verify that Provider1.tr_summary() falls back to job.id, if summary is
+        not defined
+        """
+        job = JobDefinition({'id': 'id'})
+        self.assertEqual(job.tr_summary(), 'id')
+
     def test_tr_description(self):
         """
         Verify that Provider1.tr_description() works as expected