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

[Marc Tardif]

[Jeff Lane  (bladernr)]

Looks good. Approve

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-30 13:30:52 +0000
+++ debian/changelog	2011-04-05 13:35:20 +0000
@@ -1,5 +1,7 @@
 checkbox (0.11.3) natty; urgency=low
 
+  * Fixed keyerror when running some manual tests (LP: #729431)
+
   [Ara Pulido]
   * Improved debconf messages and ordering (LP: #553777)
   * Video bugs should be reported as a display symptom (LP: #744964)
 
=== modified file 'plugins/manual_test.py'
--- plugins/manual_test.py	2010-03-07 19:57:57 +0000
+++ plugins/manual_test.py	2011-04-05 13:35:20 +0000
@@ -34,7 +34,9 @@
             # Avoid modifying the content of test in place
             temp = dict(test)
             self._manager.reactor.fire("prompt-shell", interface, temp)
-            return (temp["status"], temp["data"], temp["duration"])
+            return (temp["status"],
+                temp.get("data", ""),
+                temp.get("duration", 0))
 
         interface.show_test(test, runner)
         self._manager.reactor.fire("prompt-test", interface, test)