Job added into .pxu testplan file

4 files changed, 32 insertions, 5 deletions

diff --git a/bin/disk_smart b/bin/disk_smart
index ff3e102d..7e6929f9 100755
--- a/bin/disk_smart
+++ b/bin/disk_smart
@@ -234,7 +234,7 @@ def poll_for_status(args, disk, previous_entries):
 if args.timeout is not None:
 if args.timeout <= 0:
 logging.debug('Polling timed out')
- return 1
+ return 'Polling timed out', 1
 else:
 args.timeout -= args.sleep
 
diff --git a/bin/optical_write_test b/bin/optical_write_test
index d3f772b0..b1276678 100755
--- a/bin/optical_write_test
+++ b/bin/optical_write_test
@@ -44,7 +44,7 @@ check_md5(){
 generate_iso(){
 # Generate ISO image
 echo "Creating ISO Image ..."
- genisoimage -r -J -o $ISO_NAME $SAMPLE_FILE
+ genisoimage -input-charset UTF-8 -r -J -o $ISO_NAME $SAMPLE_FILE
 return $?
 }
 
@@ -123,7 +123,7 @@ cleanup(){
 cd $START_DIR
 echo "Now residing in $PWD"
 echo "Cleaning up ..."
- umount $MOUNT_PT
+ umount "$MOUNT_PT"
 rm -fr $TEMP_DIR
 echo "Ejecting spent media ..."
 eject $OPTICAL_DRIVE
diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 15902a62..b2cd9515 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -550,3 +550,30 @@ command: [ -f ${PLAINBOX_SESSION_SHARE}/screen-capture.png ] && base64 ${PLAINBO
 _description: Attaches the simple screen capture file
 
 
+unit: job
+id: graphics_card_resource
+plugin: resource
+command: graphics_card_resource
+
+unit: template
+template-unit: job
+template-resource: graphics_card_resource
+plugin: shell
+id: "graphics/{index}_screen-capture-internal_{product}"
+_summary: Obtains a simple screen capture of {product}
+estimated_duration: 1.0
+requires: package.name == 'gnome-screenshot'
+command: gnome-screenshot --file $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png
+_description: Obtains a simple screen capture of {product} using gnome-screenshot if present
+
+unit: template
+template-unit: job
+template-resource: graphics_card_resource
+plugin: attachment
+id: graphics/{index}_screen-capture-internal_{product}.png
+depends: "graphics/{index}_screen-capture-internal_{product}"
+_summary: Attaches a simple screen capture of {product}
+estimated_duration: 1.0
+command: [ -f $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png ] && base64 $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png
+_description: Attaches the simple screen capture file of {product}
+
diff --git a/po/pl.po b/po/pl.po
index 97b15489..2737654d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-07 05:47+0000\n"
-"X-Generator: Launchpad (build 17331)\n"
+"X-Launchpad-Export-Date: 2015-03-03 05:17+0000\n"
+"X-Generator: Launchpad (build 17361)\n"
 "Language: Polish\n"
 
 #. description