Merge lp:~cr3/checkbox/912546 into lp:checkbox

[Marc Tardif]

[Marc Tardif (cr3)]

By the way, this merge request is mostly relevant to checkbox-to-certification. So, once this request is approved, the diff should be backported to 0.12 and packages built in the hardware-certification PPA.

[Daniel Manrique (roadmr)]

OK, merged. thanks for fixing this obscure problem!

review: Approve

=== modified file 'checkbox/parsers/submission.py'
--- checkbox/parsers/submission.py	2011-10-11 20:15:01 +0000
+++ checkbox/parsers/submission.py	2012-01-05 22:49:26 +0000
@@ -331,7 +331,10 @@
             command = child.get("command")
             if command not in duplicates:
                 duplicates.add(command)
-                result.addContext(child.text, command)
+                text = child.text
+                if text is None:
+                    text = ""
+                result.addContext(text, command)
             else:
                 self.logger.debug(
                     "Duplicate command found in tag <info>: %s" % command)
@@ -453,9 +456,10 @@
                     question["targets"].append(target)
 
                 elif sub_tag in ("comment", "command",):
-                    data = sub_node.text
-                    if data is not None:
-                        question[sub_tag] = data.strip()
+                    text = sub_node.text
+                    if text is None:
+                        text = ""
+                    question[sub_tag] = text.strip()
 
                 else:
                     raise AssertionError(

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-05 16:20:12 +0000
+++ debian/changelog	2012-01-05 22:49:26 +0000
@@ -23,7 +23,9 @@
   * Using title defined in user_interface plugin in GTK interface.
   * Updated default.whitelist to reflect renamed jobs.
   * Removed files with non-printable characters from submission.xml.
-  
+  * Fixed parser for submission files with empty question comments
+    and context info (LP: #912546)
+
   [Daniel Manrique]
   * Update control files under debian/ to eliminate (most) lintian warnings
     (LP: #352986)