Merge lp:~kelemeng/checkbox/904876 into lp:checkbox

[Gabor Kelemen]

[Daniel Manrique (roadmr)]

Thanks Gabor!

I just have a comment, would it make sense to name the variable for the string "test_name", or is just "name" clear enough? this is on line 23-24 of the diff.

[Marc Tardif (cr3)]

Good catch, thanks for the fix! I added an entry for you in the changelog while merging the changes.

review: Approve

[Gabor Kelemen (kelemeng)]

Thanks for the quick reply!

Daniel: I think this is enough, it's obvious to me what it talks about. This change is necessary not for clarification, but the ability to reorder the variables.

=== modified file 'checkbox/user_interface.py'
--- checkbox/user_interface.py	2010-04-16 20:47:07 +0000
+++ checkbox/user_interface.py	2011-12-15 18:32:34 +0000
@@ -133,7 +133,7 @@
             os.close(w)
             (pid, status) = os.wait()
             if status:
-                text = _("Unable to start web browser to open %s." % url)
+                text = _("Unable to start web browser to open %s.") % url
                 message = os.fdopen(r).readline()
                 if message:
                     text += "\n" + message

=== modified file 'plugins/apport_prompt.py'
--- plugins/apport_prompt.py	2011-10-06 20:23:31 +0000
+++ plugins/apport_prompt.py	2011-12-15 18:32:34 +0000
@@ -224,10 +224,11 @@
             return
 
         if test.get("suite"):
-            failed_test_message = _("Test %s from suite %s failed." %
-                (test["name"], test["suite"]))
+            failed_test_message = _("Test %(name)s from suite %(suite)s failed.") % {
+                                   'name' : test["name"], 
+                                   'suite:' : test["suite"]}
         else:
-            failed_test_message = _("Test %s failed." % test["name"])
+            failed_test_message = _("Test %s failed.") % test["name"]
         failed_test_message += "\n" + _("Do you want to report a bug?")
 
         response = interface.show_info(failed_test_message,

=== modified file 'plugins/shell_test.py'
--- plugins/shell_test.py	2011-05-19 19:04:52 +0000
+++ plugins/shell_test.py	2011-12-15 18:32:34 +0000
@@ -49,7 +49,7 @@
             event_id = self._manager.reactor.call_on("message-result", message_result, -100)
 
             interface.show_progress(
-                _("Running %s..." % test["name"]), self._manager.reactor.fire,
+                _("Running %s...") % test["name"], self._manager.reactor.fire,
                 "message-exec", test)
 
             self._manager.reactor.cancel_call(event_id)

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-10-18 20:57:05 +0000
+++ po/POTFILES.in	2011-12-15 18:32:34 +0000
@@ -43,6 +43,7 @@
 [type: gettext/rfc822deb] jobs/user_apps.txt.in
 [type: gettext/rfc822deb] jobs/wireless.txt.in
 checkbox/application.py
+checkbox/job.py
 checkbox/lib/signal.py
 checkbox_cli/cli_interface.py
 checkbox_urwid/urwid_interface.py
@@ -54,6 +55,7 @@
 plugins/intro_prompt.py
 plugins/launchpad_exchange.py
 plugins/launchpad_prompt.py
+plugins/launchpad_report.py
 plugins/lock_prompt.py
 plugins/recover_prompt.py
 plugins/report_prompt.py