Merge lp:~brendan-donegan/checkbox/bug1016126_screenshot_after_suspend_base64 into lp:checkbox

[Brendan Donegan]

The screenshot.jpg and screenshot_fullscreen_video attachment jobs base64 encoded the attachments, which seems to have been the right thing to do in terms of checkbox processing them. screenshot_after_suspend.jpg neglected to though, so this merge fixes that.

[Daniel Manrique (roadmr)]

Looks straightforward enough.

Thanks!

Merging..

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-20 16:10:42 +0000
+++ debian/changelog	2012-06-21 16:08:25 +0000
@@ -16,6 +16,9 @@
     (LP: #1004212)
   * Instead of checking output of nmcli con up in create_connection,
     check the return code is success instead (LP: #1013537)
+  * base64 encode the after suspend screenshot attachement so that it can
+    be uploaded properly (LP: #1016126)
+    
 
   [Marc Tardif]
   * [FEATURE] Reworked media_keys_test into key_test, making it more generic

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2012-06-18 16:04:36 +0000
+++ jobs/suspend.txt.in	2012-06-21 16:08:25 +0000
@@ -319,5 +319,5 @@
 plugin: attachment
 name: screenshot_after_suspend.jpg
 depends: suspend/screenshot_after_suspend
-command: cat ${CHECKBOX_DATA}/screenshot_after_suspend.jpg
+command: base64 ${CHECKBOX_DATA}/screenshot_after_suspend.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.