Merge lp:~roadmr/ubuntu/precise/checkbox/0.13.1 into lp:ubuntu/precise/checkbox

[Daniel Manrique]

With a sincere apology for the previous, botched merge request, all traces of which have hopefully been either deleted or forgotten, here it is: Checkbox 0.13.1, contains a lot of bugfixes and enhancements.

Detailed changelog is available in the candidate revision request bug 925090.

Thanks!

[Mathieu Trudel-Lapierre (cyphermox)]

 - I see there are extra changes for a checkbox-sru script; they should either be added to changelog or dropped.

- There are also extra changes in install/postinst for update_configuration() (third hunk in the diff) that weren't immediately obvious to me what they were for besides the dropped hwtest packages. They should be better described in changelog (if not already there).

- there is no mention of the changes to jobs/local.txt.in for the command; changing from .../peripheral.txt to .../phoronix.txt looks rather unusual; and should be mentioned in syslog.

- changes to plugins/jobs_prompt.py aren't changelog, afaict; please add them :)

- there appears to be extra changes to scripts/cpu_offlining; again not in changelog when they should probably be.

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

I also found that the check_is_laptop script is probably missing, it might have not been added to version control w/ bzr add. ;)

In general, I found the changelog entry quality to be a little low -- given the extreme size of the changelog, please try as a group to be extra careful about writing clear and precise changelog entries in order to simplify review. There was a good UDW session about this for reference (https://wiki.ubuntu.com/MeetingLogs/devweek1201/WritingCrispChangelogs).

review: Needs Fixing

Unmerged revisions

37. By Daniel Manrique on 2012-02-01

New upstream release (LP: #925090):
* Fixed the cpu_topology script so that it doesn't mistake the word
  'processor' in the value of another field for the field 'processor'
  (LP: #882161)
* Added create_connection script and jobs to automatically create/test a
  wireless network connection.
* Updated wireless job dependencies.
* Add wireless performance data collecting tests.
* Changed is_laptop test to a shell test and implemented a check_is_laptop
  script to check automatically for a systems 'laptopness' (LP: #886668)
* Fixed connect_wireless script which continued failing to correctly
  identify wireless connections.
* Don't fail the sleep_test if the wake alarm is still set (LP: #911161)
* Add requirement for mem sleep state to be supported to the
  suspend_advanced_auto job (LP: #804190)
* Fixed the camera/display test and removed the camera/video one.
* Added display resource and matching requirements to external video
  output tests.
* Added removable_storage_watcher script to replace watch_command to make
  testing USB, FireWire and MMC devices easier and more cohesive.
* Added memory_compare script to automate the memory/info job
* Switch audio settings to correct device before running audio tests
  (LP: #916859)
* Fixed last two remaining strings with backslashes (LP: #868571)
* Fix misplaced parentheses, so translation can work (LP: #904876)
* Refactored install script to be agnostic of variant name.
* 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)
* Added support for skipping tests when the depends don't pass
  (LP: #509598)
* Removed extraneous code from the sleep_test.
* Refactored logic to check for network after suspend.
* Removed deprecated hwtest package.
* Update control files under debian/ to eliminate (most) lintian warnings
  (LP: #352986)
* Environment variables specified with environ: in a job description will be
  passed to the backend for it to add to its environment. (LP: #897889)
* Handle malformed LANGUAGE environment variable values (LP: #912946)
* Added interactive media_keys_test script.
* Make creation of wireless connection files more robust (LP: #923836)
* Recommend gstreamer-gconf to enable media tests on kubuntu (LP: #898641)
* Add bluetooth device requirement to obex jobs (LP: #921128)
* Add a plugin conf variable for the welcome string (shown on the first
  screen when checkbox runs), so it can be changed without much effort.
* Remove superflous bluetooth/detect job
* Fixed spelling mistakes in user_apps job file. (LP: #904209)
* Created automated network info test to get some config info during automated
  runs. (LP: #912038)
* Added requires to suspend wireless jobs so they won't run if wireless isn't
  present (LP: #907150)
* Fixed issue in usb_test with unwritable filesystems (LP: #912522)
* Fixed USB tests so that insert, storage, remove run in proper order
* Removed usb_storage_after_suspend since it's superfluous, all other USB
  tests already run after suspend.
* Modifed usb_test to handle firewire drives as well, renamed script to
  removable_storage_test
* Improvements to Recover dialog and show_info method.
* Error while creating binary package fixed (LP: #921576)
* Replaced xrandr_display_modes with automated check for VESA driver
* Refactored Unity compatibility tests
* Nixed graphics/xorg-version-output job and updated other job dependencies,
  since it is redundant with graphics/xorg-version. (LP: #671144)

=== modified file 'bin/checkbox-cli'
--- bin/checkbox-cli	2011-07-01 11:37:27 +0000
+++ bin/checkbox-cli	2012-02-01 21:26:27 +0000
@@ -3,7 +3,7 @@
 export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
 export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:-}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/default.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
 if [ $CHECKBOX_DATA != '.' ]

=== modified file 'bin/checkbox-gtk'
--- bin/checkbox-gtk	2011-07-01 11:37:27 +0000
+++ bin/checkbox-gtk	2012-02-01 21:26:27 +0000
@@ -3,7 +3,7 @@
 export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
 export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:-}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/default.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
 if [ $CHECKBOX_DATA != '.' ]

=== modified file 'bin/checkbox-urwid'
--- bin/checkbox-urwid	2011-07-01 11:37:27 +0000
+++ bin/checkbox-urwid	2012-02-01 21:26:27 +0000
@@ -3,7 +3,7 @@
 export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
 export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:-}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/default.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
 if [ $CHECKBOX_DATA != '.' ]

=== modified file 'checkbox/lib/config.py'
--- checkbox/lib/config.py	2011-11-18 12:46:21 +0000
+++ checkbox/lib/config.py	2012-02-01 21:26:27 +0000
@@ -69,7 +69,9 @@
     def __init__(self, parent, name, attributes={}):
         self.parent = parent
         self.name = name
-        self.attributes = attributes
+        self.attributes = {}
+        for key, value in attributes.iteritems():
+            self.attributes[key] = re.sub("\n\.\n", "\n\n", value)
 
     def __getattr__(self, name):
         if name in self.attributes:

=== modified file 'checkbox/lib/template_i18n.py'
--- checkbox/lib/template_i18n.py	2010-03-09 16:58:36 +0000
+++ checkbox/lib/template_i18n.py	2012-02-01 21:26:27 +0000
@@ -77,7 +77,8 @@
         languages = []
         if environ.has_key("LANGUAGE") and environ["LANGUAGE"]:
             for language in environ["LANGUAGE"].split(":"):
-                languages.extend(self._get_language_list(language))
+                if language:
+                    languages.extend(self._get_language_list(language))
 
         language = locale.setlocale(locale.LC_MESSAGES)
         languages.extend(self._get_language_list(language))

=== modified file 'checkbox/parsers/submission.py'
--- checkbox/parsers/submission.py	2011-11-18 12:46:21 +0000
+++ checkbox/parsers/submission.py	2012-02-01 21:26:27 +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 'checkbox/user_interface.py'
--- checkbox/user_interface.py	2010-04-06 14:17:46 +0000
+++ checkbox/user_interface.py	2012-02-01 21:26:27 +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 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2011-11-18 12:46:21 +0000
+++ checkbox_gtk/gtk_interface.py	2012-02-01 21:26:27 +0000
@@ -92,7 +92,7 @@
         self.IMAGE_HEAD_BACKGROUND = posixpath.join(data_path,
             "checkbox-gtk-head.png")
         self.FONT = "Ubuntu"
-        self.TEXT =_("System Testing")
+        self.TEXT = title
 
         image_head=self._get_widget("image_head")
         try:
@@ -546,10 +546,15 @@
             message_format=text)
         message_dialog.set_modal(True)
         message_dialog.set_title(_("Info"))
+        message_dialog.connect("realize", lambda x: \
+            x.get_window().set_functions(Gdk.WMFunction.MOVE))
 
+        if default:
+            # We have a default, move it to the end of the button list
+            options.remove(default)
+            options.append(default)
         for index, option in enumerate(options):
-            button = getattr(Gtk, "STOCK_%s" % option.upper())
-            message_dialog.add_buttons(button, index)
+            message_dialog.add_button(option, index)
 
         self._run_dialog(message_dialog)
         message_dialog.hide()

=== modified file 'data/whitelists/default.whitelist'
--- data/whitelists/default.whitelist	2011-11-18 12:46:21 +0000
+++ data/whitelists/default.whitelist	2012-02-01 21:26:27 +0000
@@ -9,20 +9,21 @@
 module
 package
 uname
+sleep
+display
 __audio__
 audio/alsa_record_playback_external
 audio/alsa_record_playback_internal
 audio/alsa_record_playback_usb
 audio/playback_auto
 __bluetooth__
-bluetooth/detect
 bluetooth/detect-output
 __camera__
 camera/detect
 camera/still
-camera/video
+camera/display
 __cpu__
-cpu/offlining
+cpu/offlining_test
 cpu/topology
 cpu/clocktest
 __disk__
@@ -35,27 +36,29 @@
 disk/benchmark_sdf
 disk/detect
 __firewire__
-firewire/hdd
+firewire/insert
+firewire/storage-test
+firewire/remove
 __graphics__
 graphics/compiz_check
 graphics/display
 graphics/resolution
 graphics/minimum_resolution
-graphics/xrandr_detect_modes
+graphics/VESA_drivers_not_in_use
 __info__
-info/codecs_attachment
-info/cpuinfo_attachment
-info/dmesg_attachment
-info/dmi_attachment
-info/dmidecode_attachment
-info/lsmod_attachment
-info/lspci_attachment
-info/gcov_attachment
-info/modprobe_attachment
-info/modules_attachment
-info/sysfs_attachment
-info/sysctl_attachment
-info/udev_attachment
+codecs_attachment
+cpuinfo_attachment
+dmesg_attachment
+dmi_attachment
+dmidecode_attachment
+lsmod_attachment
+lspci_attachment
+gcov_attachment
+modprobe_attachment
+modules_attachment
+sysfs_attachment
+sysctl_attachment
+udev_attachment
 __input__
 input/keyboard
 input/mouse
@@ -68,8 +71,30 @@
 keys/volume
 keys/wireless
 __mediacard__
-mediacard/sd
-mediacard/sd_after_suspend
+mediacard/mmc-insert
+mediacard/mmc-storage
+mediacard/mmc-remove
+mediacard/mmc-insert-after-suspend
+mediacard/mmc-storage-after-suspend
+mediacard/mmc-remove-after-suspend
+mediacard/sd-insert
+mediacard/sd-storage
+mediacard/sd-remove
+mediacard/sd-insert-after-suspend
+mediacard/sd-storage-after-suspend
+mediacard/sd-remove-after-suspend
+mediacard/sdhc-insert
+mediacard/sdhc-storage
+mediacard/sdhc-remove
+mediacard/sdhc-insert-after-suspend
+mediacard/sdhc-storage-after-suspend
+mediacard/sdhc-remove-after-suspend
+mediacard/cf-insert
+mediacard/cf-storage
+mediacard/cf-remove
+mediacard/cf-insert-after-suspend
+mediacard/cf-storage-after-suspend
+mediacard/cf-remove-after-suspend
 __memory__
 memory/info
 __miscellanea__
@@ -100,6 +125,7 @@
 suspend/bluetooth_detect_after_suspend
 suspend/memory_before_suspend
 suspend/memory_after_suspend
+suspend/network_before_suspend
 suspend/network_after_suspend
 suspend/resolution_after_suspend
 suspend/resolution_before_suspend
@@ -108,6 +134,6 @@
 suspend/wireless_before_suspend
 __usb__
 usb/detect
-usb/storage-transfer
+usb/storage-automated
 usb/insert
 usb/remove

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-18 12:46:21 +0000
+++ debian/changelog	2012-02-01 21:26:27 +0000
@@ -1,3 +1,89 @@
+checkbox (0.13.1) precise; urgency=low
+
+  New upstream release (LP: #925090):
+
+  [Brendan Donegan]
+  * Fixed the cpu_topology script so that it doesn't mistake the word
+    'processor' in the value of another field for the field 'processor'
+    (LP: #882161)
+  * Added create_connection script and jobs to automatically create/test a
+    wireless network connection.
+  * Updated wireless job dependencies.
+  * Add wireless performance data collecting tests.
+  * Changed is_laptop test to a shell test and implemented a check_is_laptop
+    script to check automatically for a systems 'laptopness' (LP: #886668)
+  * Fixed connect_wireless script which continued failing to correctly
+    identify wireless connections.
+  * Don't fail the sleep_test if the wake alarm is still set (LP: #911161)
+  * Add requirement for mem sleep state to be supported to the
+    suspend_advanced_auto job (LP: #804190)
+  * Fixed the camera/display test and removed the camera/video one.
+  * Added display resource and matching requirements to external video 
+    output tests.
+  * Added removable_storage_watcher script to replace watch_command to make
+    testing USB, FireWire and MMC devices easier and more cohesive.
+  * Added memory_compare script to automate the memory/info job
+  * Switch audio settings to correct device before running audio tests
+    (LP: #916859)
+
+  [Gabor Kelemen]
+  * Fixed last two remaining strings with backslashes (LP: #868571)
+  * Fix misplaced parentheses, so translation can work (LP: #904876)
+
+  [Marc Tardif]
+  * Refactored install script to be agnostic of variant name.
+  * 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)
+  * Added support for skipping tests when the depends don't pass
+    (LP: #509598)
+  * Removed extraneous code from the sleep_test.
+  * Refactored logic to check for network after suspend.
+  * Removed deprecated hwtest package.
+
+  [Daniel Manrique]
+  * Update control files under debian/ to eliminate (most) lintian warnings
+    (LP: #352986)
+  * Environment variables specified with environ: in a job description will be
+    passed to the backend for it to add to its environment. (LP: #897889)
+  * Handle malformed LANGUAGE environment variable values (LP: #912946)
+  * Added interactive media_keys_test script.
+  * Make creation of wireless connection files more robust (LP: #923836)
+  * Recommend gstreamer-gconf to enable media tests on kubuntu (LP: #898641)
+  * Add bluetooth device requirement to obex jobs (LP: #921128)
+  * Add a plugin conf variable for the welcome string (shown on the first
+    screen when checkbox runs), so it can be changed without much effort.
+  * Remove superflous bluetooth/detect job
+
+  [Robert Roth]
+  * Fixed spelling mistakes in user_apps job file. (LP: #904209)
+
+  [Jeff Lane]
+  * Created automated network info test to get some config info during automated 
+    runs. (LP: #912038)
+  * Added requires to suspend wireless jobs so they won't run if wireless isn't
+    present (LP: #907150)
+  * Fixed issue in usb_test with unwritable filesystems (LP: #912522)
+  * Fixed USB tests so that insert, storage, remove run in proper order
+  * Removed usb_storage_after_suspend since it's superfluous, all other USB
+    tests already run after suspend.
+  * Modifed usb_test to handle firewire drives as well, renamed script to
+    removable_storage_test
+
+  [Aurélien Gâteau]
+  * Improvements to Recover dialog and show_info method.
+
+  [ Javier Collado ]
+  * Error while creating binary package fixed (LP: #921576)
+
+  [ Sylvain Pineau ]
+  * Replaced xrandr_display_modes with automated check for VESA driver
+  * Refactored Unity compatibility tests
+
+ -- Daniel Manrique <[e-mail]>  Tue, 31 Jan 2012 14:34:52 -0500
+
 checkbox (0.13) precise; urgency=low
 
   New upstream release (LP: #892268):
@@ -49,6 +135,8 @@
     the test description (LP: #890725)
   * Allow input/mouse test to run if a TOUCH device is present
     (LP: #886129)
+  * Nixed graphics/xorg-version-output job and updated other job dependencies,
+    since it is redundant with graphics/xorg-version. (LP: #671144)
 
   [ Javier Collado ]
   * Broken job dependencies fixed (LP: #888447)
@@ -231,7 +319,7 @@
 
 checkbox (0.12.3) oneiric; urgency=low
 
-  [ Marc Tardif ]
+  [Marc Tardif]
   * Only reading CHECKBOX_* environment variables in config (LP: #802458)
   * Imported scripts and jobs from Platform Services.
 

=== modified file 'debian/checkbox-cli.postinst'
--- debian/checkbox-cli.postinst	2009-01-20 16:46:15 +0000
+++ debian/checkbox-cli.postinst	2012-02-01 21:26:27 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'debian/checkbox-gtk.postinst'
--- debian/checkbox-gtk.postinst	2009-01-20 16:46:15 +0000
+++ debian/checkbox-gtk.postinst	2012-02-01 21:26:27 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'debian/checkbox-urwid.postinst'
--- debian/checkbox-urwid.postinst	2010-06-22 10:43:52 +0000
+++ debian/checkbox-urwid.postinst	2012-02-01 21:26:27 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'debian/control'
--- debian/control	2011-09-14 21:16:02 +0000
+++ debian/control	2012-02-01 21:26:27 +0000
@@ -1,9 +1,9 @@
 Source: checkbox
 Section: utils
 Priority: optional
-XSBC-Original-Maintainer: Marc Tardif <[e-mail]>
+Uploaders: Marc Tardif <[e-mail]>
 Maintainer: Ubuntu Core Developers <[e-mail]>
-Standards-Version: 3.7.3
+Standards-Version: 3.9.2
 X-Python-Version: >= 2.6
 Build-Depends: debhelper (>= 7.0.50~), dh-translations, python (>= 2.6.6-3~), po-debconf, python-distutils-extra
 Vcs-Bzr: https://code.launchpad.net/~hardware-certification/checkbox/trunk
@@ -11,22 +11,16 @@
 Package: checkbox
 Section: python
 Architecture: any
-Replaces: hwtest (<< 0.1-0ubuntu12)
-Provides: hwtest
 Depends: ${misc:Depends}, ${python:Depends}, debconf, python-libxml2, udev
-Recommends: dpkg (>= 1.13), lsb-release, pm-utils, python-apport, python-apt, python-dateutil, python-gst0.10
+Recommends: dpkg (>= 1.13), gstreamer0.10-gconf, lsb-release, perl, pm-utils, python-apport, python-apt, python-dateutil, python-gst0.10
 Suggests: checkbox-cli | checkbox-gtk, bonnie++, bootchart, bzr, cvs, ethtool, flex, fwts, git-core, hdparm, lshw, make, nmap, obexd-client, python-pexpect, smartmontools, sox, stress, wodim
-Conflicts: hwtest (<< 0.1-0ubuntu12)
 Description: System testing application 
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
 
 Package: checkbox-cli
 Architecture: all
-Replaces: hwtest-cli (<< 0.1-0ubuntu12)
-Provides: hwtest-cli
-Depends: checkbox (= ${source:Version})
-Conflicts: hwtest-cli (<< 0.1-0ubuntu12)
+Depends: checkbox (>= ${source:Version}), ${misc:Depends}
 Description: Command line interface for checkbox 
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
@@ -35,7 +29,7 @@
 
 Package: checkbox-urwid
 Architecture: all
-Depends: checkbox (= ${source:Version}), python-urwid
+Depends: checkbox (>= ${source:Version}), python-urwid, ${misc:Depends}
 Description: Urwid interface for checkbox 
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
@@ -46,34 +40,18 @@
 Package: checkbox-gtk
 Section: gnome
 Architecture: all
-Replaces: hwtest-gtk (<< 0.1-0ubuntu12)
-Provides: hwtest-gtk
-Depends: checkbox (= ${source:Version}), gksu, python-gobject (>= 2.28), gir1.2-gtk-3.0
-Conflicts: hwtest-gtk (<< 0.1-0ubuntu12)
+Depends: checkbox (>= ${source:Version}), gksu, python-gobject (>= 2.28), gir1.2-gtk-3.0, ${misc:Depends}
 Description: GTK interface for checkbox
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
  .
  This package provides a GTK interface for answering tests.
 
-Package: hwtest
-Section: python
-Architecture: all
-Depends: checkbox
-Description: Transitional package to checkbox
- This package is a transitional package for renaming hwtest to checkbox.
-
-Package: hwtest-cli
-Architecture: all
-Depends: checkbox-cli
-Description: Transitional package to checkbox-cli
- This package is a transitional package for renaming hwtest-cli to
- checkbox-cli.
-
-Package: hwtest-gtk
-Section: gnome
-Architecture: all
-Depends: checkbox-gtk
-Description: Transitional package to checkbox-gtk
- This package is a transitional package for renaming hwtest-gtk to
- checkbox-gtk.
+Package: checkbox-sru
+Architecture: all
+Depends: checkbox (>= ${source:Version}), ${misc:Depends}
+Description: SRU interface for checkbox 
+ This project provides an extensible interface for system testing. The
+ results can then be sent to Launchpad.
+ .
+ This package provides a non-interactive interface for SRU testing.

=== removed file 'debian/hwtest-cli.postinst'
--- debian/hwtest-cli.postinst	2009-01-20 16:46:15 +0000
+++ debian/hwtest-cli.postinst	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#! /bin/sh -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#

=== removed file 'debian/hwtest-gtk.postinst'
--- debian/hwtest-gtk.postinst	2009-01-20 16:46:15 +0000
+++ debian/hwtest-gtk.postinst	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#! /bin/sh -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#

=== removed file 'debian/hwtest.postinst'
--- debian/hwtest.postinst	2009-01-20 16:46:15 +0000
+++ debian/hwtest.postinst	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#! /bin/sh -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#

=== removed file 'debian/hwtest.postrm'
--- debian/hwtest.postrm	2009-03-31 13:54:12 +0000
+++ debian/hwtest.postrm	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-#! /bin/sh -e
-
-name=`basename $0 .postrm`
-base=`echo $name | cut -d "-" -f "1"`
-file="/etc/$base.d/$name.ini"
-
-case "$1" in
-    purge)
-        # mimic dpkg as closely as possible, so remove configuration
-        # files with dpkg backup extensions too:
-        for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist;  do
-            rm -f $file$ext
-        done
-
-        # remove the configuration file itself
-        rm -f $file
-        ;;
-    remove|disappear|upgrade|failed-upgrade|abort-install|abort-upgrade)
-        ;;
-    *)
-        echo "$0: didn't understand being called with \`$1'" 1>&2
-        exit 0
-        ;;
-esac
-
-#DEBHELPER#

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2011-09-29 13:12:01 +0000
+++ debian/po/de.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-09-27 06:16+0000\n"
 "Last-Translator: Hendrik Knackstedt <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-28 04:31+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2011-08-10 21:09:56 +0000
+++ debian/po/en_AU.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-21 02:39+0000\n"
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-22 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2011-09-01 12:23:07 +0000
+++ debian/po/en_GB.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-08-09 23:13+0000\n"
-"Last-Translator: Aldo Mann <Unknown>\n"
+"Last-Translator: Alfredo Hernández <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-11 04:31+0000\n"
-"X-Generator: Launchpad (build 13644)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2011-09-01 12:23:07 +0000
+++ debian/po/es.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-08-11 04:29+0000\n"
 "Last-Translator: Fitoschido <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-12 04:34+0000\n"
-"X-Generator: Launchpad (build 13662)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description
@@ -70,7 +69,8 @@
 #. Description
 #: ../checkbox.templates:4001
 msgid "List of jobs to run when testing with checkbox."
-msgstr "Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
+msgstr ""
+"Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
 
 #. Type: string
 #. Description

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2011-08-10 21:09:56 +0000
+++ debian/po/fr.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-19 10:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <[e-mail]>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-20 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/he.po'
--- debian/po/he.po	2011-08-10 21:09:56 +0000
+++ debian/po/he.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-26 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
-"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-27 04:30+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2011-08-10 21:09:56 +0000
+++ debian/po/hu.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 12:57+0000\n"
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-19 04:30+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2011-09-29 13:12:01 +0000
+++ debian/po/it.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-09-22 14:07+0000\n"
 "Last-Translator: Sergio Zanchetta <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-23 04:34+0000\n"
-"X-Generator: Launchpad (build 14012)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2011-08-10 21:09:56 +0000
+++ debian/po/ja.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-25 17:03+0000\n"
 "Last-Translator: Fumihito YOSHIDA <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-26 04:31+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description
@@ -31,9 +30,8 @@
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
 msgstr ""
-"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどう"
-"か、checkboxが確認するようになります。これはapportが有効になっていなくても機"
-"能します。"
+"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどうか、checkboxが確認するようになります。これはapportが有効になって"
+"いなくても機能します。"
 
 #. Type: string
 #. Description
@@ -47,9 +45,7 @@
 msgid ""
 "When filing a new bug through checkbox, if it does not guess the  package, "
 "the default package that the bug will be file against."
-msgstr ""
-"checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デ"
-"フォルトのパッケージ名を用いて報告します。"
+msgstr "checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デフォルトのパッケージ名を用いて報告します。"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2011-09-01 12:23:07 +0000
+++ debian/po/nl.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-08-17 12:02+0000\n"
 "Last-Translator: Rachid <Unknown>\n"
 "Language-Team: Dutch <[e-mail]>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:31+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2011-08-10 21:09:56 +0000
+++ debian/po/pl.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 21:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <[e-mail]>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-19 04:30+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2011-09-29 13:12:01 +0000
+++ debian/po/pt_BR.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-09-16 19:04+0000\n"
 "Last-Translator: André Gondim <Unknown>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-17 04:32+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2011-11-18 12:46:21 +0000
+++ debian/po/ro.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-10-27 20:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <[e-mail]>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-28 05:11+0000\n"
-"X-Generator: Launchpad (build 14197)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2011-08-10 21:09:56 +0000
+++ debian/po/ru.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 12:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <[e-mail]>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-19 04:30+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2011-08-10 21:09:56 +0000
+++ debian/po/zh_TW.po	2012-02-01 21:26:27 +0000
@@ -6,17 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-26 15:03+0000\n"
 "Last-Translator: Cheng-Chia Tseng <[e-mail]>\n"
 "Language-Team: Chinese (Traditional) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-27 04:30+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-12-02 04:41+0000\n"
+"X-Generator: Launchpad (build 14414)\n"
 
 #. Type: boolean
 #. Description
@@ -30,9 +29,7 @@
 msgid ""
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提"
-"交失敗測試的臭蟲回報。"
+msgstr "若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提交失敗測試的臭蟲回報。"
 
 #. Type: string
 #. Description

=== modified file 'debian/rules'
--- debian/rules	2011-07-01 11:37:27 +0000
+++ debian/rules	2012-02-01 21:26:27 +0000
@@ -7,8 +7,7 @@
 	cp debian/checkbox.postrm debian/checkbox-cli.postrm
 	cp debian/checkbox.postrm debian/checkbox-urwid.postrm
 	cp debian/checkbox.postrm debian/checkbox-gtk.postrm
-	cp debian/hwtest.postrm debian/hwtest-cli.postrm
-	cp debian/hwtest.postrm debian/hwtest-gtk.postrm
+	cp debian/checkbox.postrm debian/checkbox-sru.postrm
 	dh_installdeb
 
 override_dh_installdocs:
@@ -16,14 +15,11 @@
 	dh_installdocs -pcheckbox-cli ./README 
 	dh_installdocs -pcheckbox-urwid ./README 
 	dh_installdocs -pcheckbox-gtk ./README 
-	dh_installdocs -phwtest ./README 
-	dh_installdocs -phwtest-cli ./README 
-	dh_installdocs -phwtest-gtk ./README 
+	dh_installdocs -pcheckbox-sru ./README 
 	dh_installdocs
 
 override_dh_clean:
 	-find . -name \*.mo -exec rm {} \;
-	-rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm
-	-rm -f debian/hwtest-cli.postrm debian/hwtest-gtk.postrm
+	-rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-sru.postrm
 	debconf-updatepo
 	dh_clean

=== modified file 'install/config'
--- install/config	2011-03-17 11:15:12 +0000
+++ install/config	2012-02-01 21:26:27 +0000
@@ -69,10 +69,10 @@
     configs_base = "/usr/share/%(base_name)s/configs/%(name)s.ini"
     examples_base = "/usr/share/%(base_name)s/examples/%(name)s.ini"
 
-    def __init__(self, name, configs_path=None, examples_path=None,
-                 templates_path=None):
+    def __init__(self, name, base_name=None, configs_path=None,
+                 examples_path=None, templates_path=None):
         self.name = name
-        self.base_name = re.sub(r"(-cli|-urwid|-gtk)$", "", name)
+        self.base_name = name if base_name is None else base_name
         self._configs_path = configs_path or self.configs_base \
             % {"name": name, "base_name": self.base_name}
         self._examples_path = examples_path or self.examples_base \
@@ -147,8 +147,7 @@
     if len(args) < 1:
         return 1
 
-    package = args.pop(0)
-    install = Install(package)
+    install = Install(*args)
 
     if options.output == "-":
          file = sys.stdout

=== modified file 'install/postinst'
--- install/postinst	2010-06-22 10:43:52 +0000
+++ install/postinst	2012-02-01 21:26:27 +0000
@@ -1,11 +1,13 @@
 package=`basename $0 .postinst`
+if [ -z "$base_package" ]; then
+    base_package="$package"
+fi
 config="/etc/checkbox.d/$package.ini"
 
 patch_configuration()
 {
     version="$1"
     previous_version=""
-    base_package=`echo $package | sed -e 's/hwtest/checkbox/' -e 's/\(-cli\|-urwid\|-gtk\)//'`
 
     while [ -n "$version" ]; do
         patch_file=""
@@ -30,10 +32,6 @@
         # Apply the patch file if it is less than the given version
         patch_version=`basename $patch_file`
         if dpkg --compare-versions $version lt $patch_version; then
-            # Package was renamed from hwtest to checkbox
-            dpkg --compare-versions $patch_version lt "0.1-ubuntu13" \
-                && patch_package=`echo $package | sed 's/checkbox/hwtest/'` \
-                || patch_package=`echo $package | sed 's/hwtest/checkbox/'`
             $patch_file $patch_package
         fi
 
@@ -43,22 +41,20 @@
 
 update_configuration()
 {
-    base_package=`echo $package | cut -d '-' -f '1'`
-
-    if [ "$base_package" != "hwtest" ]; then
-        # Create a temporary file to generate the suggested
-        # configuration file.
-        tempfile=`tempfile -m 0644 -p checkbox`
-
-        # Update the temporary file with preseeded values.
-        /usr/share/checkbox/install/config --output=$tempfile $package
-
-        # Clobber the old config file.
-        cp $tempfile $config
-
-        # Now clear up the cruft.
-        rm -f $tempfile
-    fi
+    root_package=`echo $package | cut -d '-' -f '1'`
+
+    # Create a temporary file to generate the suggested
+    # configuration file.
+    tempfile=`tempfile -m 0644 -p checkbox`
+
+    # Update the temporary file with preseeded values.
+    /usr/share/checkbox/install/config --output=$tempfile $package $base_package
+
+    # Clobber the old config file.
+    cp $tempfile $config
+
+    # Now clear up the cruft.
+    rm -f $tempfile
 }
 
 case "$1" in

=== modified file 'jobs/audio.txt.in'
--- jobs/audio.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/audio.txt.in	2012-02-01 21:26:27 +0000
@@ -12,7 +12,7 @@
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base' and package.name == 'python-gst0.10'
-command: gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'
+command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
 _description:
  PURPOSE:
      This test will check that internal speakers work correctly
@@ -29,7 +29,7 @@
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base' and package.name == 'python-gst0.10'
-command: gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'
+command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
 _description:
  PURPOSE:
      This test will check that headphones connector works correctly
@@ -45,7 +45,7 @@
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base'
-command: alsa_record_playback
+command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
 _description:
  PURPOSE:
      This test will check that recording sound using the onboard microphone works correctly
@@ -62,7 +62,7 @@
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base'
-command: alsa_record_playback
+command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
 _description:
  PURPOSE:
      This test will check that recording sound using an external microphone works correctly
@@ -78,17 +78,14 @@
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base'
-command: alsa_record_playback
+command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=usb --volume=50; alsa_record_playback; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
 _description:
  PURPOSE:
      This test will check that a USB audio device works correctly
  STEPS:
      1. Connect a USB audio device to your system
-     2. Open the volume control application by left-clicking on the speaker icon in the panel and selecting "Sound Settings"
-     3. Select the "Input" tab and choose your USB device
-     4. Select the "Output" tab and choose your USB device
-     5. Click "Test", then speak into the microphone
-     6. After a few seconds, your speech will be played back to you
+     2. Click "Test", then speak into the microphone
+     3. After a few seconds, your speech will be played back to you
  VERIFICATION:
      Did you hear your speech played back through the USB headphones?
 
@@ -100,6 +97,6 @@
  device.category == 'AUDIO'
 command: audio_test
 _description:
- Play back a sound on the default output and listen for it on the \
- default input.  This makes the most sense when the output and input \
+ Play back a sound on the default output and listen for it on the 
+ default input.  This makes the most sense when the output and input 
  are directly connected, as with a patch cable.

=== modified file 'jobs/bluetooth.txt.in'
--- jobs/bluetooth.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/bluetooth.txt.in	2012-02-01 21:26:27 +0000
@@ -1,24 +1,16 @@
-plugin: shell 
-name: bluetooth/detect
-requires: 
- package.name == 'bluez'
- device.category == 'BLUETOOTH'
-command: hcitool dev | tail -n+2 | awk '{print $2}' |grep -E "^([0-9a-fA-F]{2}\:){5}[0-9a-fA-F]{2}$"
-_description:
- This test will detect your Bluetooth device and output the device's hardware address.  If no device is found, the test will exit with an error.
 
 plugin: shell
 name: bluetooth/detect-output
 requires:
  package.name == 'bluez'
  device.category == 'BLUETOOTH'
-command: hcitool dev | tail -n+2 | awk '{print $2}'; hcitool dev | tail -n+2 | awk '{print $2}' > $CHECKBOX_DATA/bluetooth_address
+command: hcitool dev | tail -n+2 | awk '{print $2}' | tee $CHECKBOX_DATA/bluetooth_address
 _description:
  Automated test to store bluetooth device information in checkbox report
 
 plugin: manual
 name: bluetooth/browse-files
-depends: bluetooth/detect
+depends: bluetooth/detect-output
 _description:
  PURPOSE:
      This test will check that bluetooth connection works correctly
@@ -37,7 +29,7 @@
 
 plugin: manual
 name: bluetooth/file-transfer
-depends: bluetooth/browse-files bluetooth/detect
+depends: bluetooth/browse-files bluetooth/detect-output
 _description:
  PURPOSE:
      This test will check that you can transfer information through a bluetooth connection
@@ -50,7 +42,7 @@
 
 plugin: manual
 name: bluetooth/audio
-depends: bluetooth/detect
+depends: bluetooth/detect-output
 command: arecord -d 5 -D bluetooth -f S16_LE | aplay -D bluetooth -f S16_LE
 _description:
  PURPOSE:
@@ -69,7 +61,7 @@
 plugin: manual
 name: bluetooth/keyboard
 command: keyboard_test
-depends: bluetooth/detect
+depends: bluetooth/detect-output
 _description:
  PURPOSE:
      This test will check that you can use a bluetooth keyboard
@@ -85,7 +77,7 @@
 
 plugin: manual
 name: bluetooth/mouse
-depends: bluetooth/detect
+depends: bluetooth/detect-output
 _description:
  PURPOSE:
      This test will check that you can use a bluetooth mouse

=== modified file 'jobs/camera.txt.in'
--- jobs/camera.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/camera.txt.in	2012-02-01 21:26:27 +0000
@@ -17,7 +17,7 @@
  PURPOSE:
      This test will check that the built-in camera works
  STEPS:
-     1. Click on Test to display a video capture from the camera
+     1. Click on Test to display a video capture from the camera for ten seconds.
  VERIFICATION:
      Did you see the video capture?
 
@@ -37,19 +37,3 @@
      1. Click on Test to display a still image from the camera
  VERIFICATION:
      Did you see the image?
-
-plugin: manual
-name: camera/video
-depends: camera/detect
-requires:
- package.name == 'python-gst0.10'
- package.name == 'totem'
- device.category == 'CAPTURE'
-command: camera_test -t video
-_description:
- PURPOSE:
-     This test will check that you can capture video with the built-in camera
- STEPS:
-     1. Click on Test to capture video to a file (it will automatically open in Totem)
- VERIFICATION:
-     Did you see and hear the capture?

=== modified file 'jobs/firewire.txt.in'
--- jobs/firewire.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/firewire.txt.in	2012-02-01 21:26:27 +0000
@@ -1,12 +1,37 @@
 plugin: manual
-name: firewire/hdd
+name: firewire/insert
+command: removable_storage_watcher insert firewire
 _description:
  PURPOSE:
-     This test will check that the firewire port works
+     This test will check the system can detect the insertion of a FireWire HDD
  STEPS:
-     1. Plug a Firewire HDD into the computer
-     2. Either a window asking which action should be performed (open folder, photo manager, etc) or a file browser will open.
-     3. Copy some files from your internal HDD to the firewire HDD
-     4. Copy some files from the firewire HDD to your internal HDD
+     1. Click 'Test' to begin the test. This test will 
+        timeout and fail if the insertion has not been detected within 10 seconds.
+     2. Plug a FireWire HDD into an available FireWire port.
  VERIFICATION:
-     Do the copy operations work as expected?
+     The verification of this test is automated. Do not change the automatically
+     selected result
+
+plugin: shell
+name: firewire/storage-test
+depends: firewire/insert
+command: removable_storage_test firewire
+_description:
+ This is an automated test which performs read/write operations on an attached
+ FireWire HDD
+
+plugin: manual
+name: firewire/remove
+depends: firewire/storage-test
+command: removable_storage_watcher remove firewire
+_description:
+  PURPOSE:
+    This test will check the system can detect the removal of a FireWire HDD
+  STEPS:
+    1. Click 'Test' to begin the test. This test will timeout and fail if
+       the removal has not been detected within 10 seconds.
+    2. Remove the previously attached FireWire HDD from the FireWire port.
+  VERIFICATION:
+    The verification of this test is automated. Do not change the automatically
+    selected result
+

=== modified file 'jobs/graphics.txt.in'
--- jobs/graphics.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/graphics.txt.in	2012-02-01 21:26:27 +0000
@@ -5,15 +5,8 @@
 _description: Test to output the Xorg version
 
 plugin: shell
-name: graphics/xorg-version-output
-command: xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
-requires: package.name == "x11-utils"
-_description:
- Automated test to store output in checkbox report
-
-plugin: shell
 name: graphics/gtkperf
-depends: graphics/xorg-version-output
+depends: graphics/xorg-version
 requires: package.name == 'gtkperf'
 command: gtkperf -a | grep "Total time:"
 _description:
@@ -21,7 +14,7 @@
 
 plugin: manual
 name: graphics/resolution-change
-depends: graphics/xorg-version-output
+depends: graphics/xorg-version
 _description:
  PURPOSE:
      This test will verify that the GUI is usable after manually changing resolution
@@ -36,7 +29,7 @@
 
 plugin: manual
 name: graphics/rotation
-depends: graphics/xorg-version-output
+depends: graphics/xorg-version
 _description:
  PURPOSE:
      This test will test display rotation
@@ -107,19 +100,10 @@
  VERIFICATION:
      Do you see color bars and static?
 
-plugin: manual
-name: graphics/xrandr_detect_modes
-requires: package.name == 'xorg'
-command: xrandr
-_description:
- PURPOSE:
-     This test checks the detected video modes
- STEPS:
-     1. The following screens and video modes have been detected on your system
- INFO:
-     $output
- VERIFICATION:
-     Are those correct?
+plugin: shell
+name: graphics/VESA_drivers_not_in_use
+command: cat /var/log/Xorg.0.log | perl -e '$a=0;while(<>){$a++ if /Loading.*vesa_drv\.so/;$a-- if /Unloading.*vesa/&&$a}exit 1 if $a'
+_description: Check that VESA drivers are not in use
 
 plugin: manual
 name: graphics/cycle_resolution
@@ -136,9 +120,17 @@
 
 plugin: shell
 name: graphics/compiz_check
-command: run_compiz_check | ansi_parser
-_description:
- Check that the hardware is able to run compiz.
+requires: package.name == 'nux-tools'
+command:
+ perl -e '$a=`/usr/lib/nux/unity_support_test -c -p`;$a=~s/\e\[[\d;]*m//g;print $a;exit($? ? 1:0)'
+_description: Check that hardware is able to run compiz
+
+plugin: shell
+name: graphics/unity-support
+requires: package.name == 'nux-tools'
+command:
+ perl -e '$a=`/usr/lib/nux/unity_support_test -p`;$a=~s/\e\[[\d;]*m//g;print $a;exit($? ? 1:0)'
+_description: Check that hardware is able to run Unity 3D
 
 plugin: manual
 name: graphics/glxgears

=== modified file 'jobs/keys.txt.in'
--- jobs/keys.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/keys.txt.in	2012-02-01 21:26:27 +0000
@@ -70,17 +70,13 @@
 name: keys/media-control
 requires:
  device.category == 'KEYBOARD'
- package.name == 'totem'
- package.name == 'gstreamer0.10-plugins-base'
-command: totem /usr/share/example-content/Ubuntu_Free_Culture_Showcase/*
+command: media_keys_test
 _description:
  PURPOSE:
      This test will test the media keys of your keyboard
  STEPS:
-     1. Click test to launch the media player
-     2. Press the play/pause key on the keyboard
-     3. Press the forward key on the keyboard
-     4. Press the backward key on the keyboard
-     5. Press stop key on the keyboard
- VERIFICATION:
+     1. Click test to open a window on which to test the media control keys.
+     2. If all the keys work, the test will be marked as passed.
+     3. If your computer has no media control keys, Skip this test.
+     VERIFICATION:
      Do the keys work as expected?

=== modified file 'jobs/local.txt.in'
--- jobs/local.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/local.txt.in	2012-02-01 21:26:27 +0000
@@ -141,7 +141,7 @@
 name: __phoronix__
 plugin: local
 _description: Phoronix Test Suite tests
-command: cat $CHECKBOX_SHARE/jobs/peripheral.txt*
+command: cat $CHECKBOX_SHARE/jobs/phoronix.txt*
 
 name: __power-management__
 plugin: local

=== modified file 'jobs/mediacard.txt.in'
--- jobs/mediacard.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/mediacard.txt.in	2012-02-01 21:26:27 +0000
@@ -1,159 +1,319 @@
 plugin: manual
-name: mediacard/sd
-_description:
- PURPOSE:
-     This test will check your system Secure Digital (SD) media card support
- STEPS:
-     1. Plug a SD media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/sd_after_suspend
-depends: suspend/suspend_advanced mediacard/sd
-_description:
- PURPOSE:
-     This test will check your system Secure Digital (SD) media card support after suspend
- STEPS:
-     1. Plug a SD media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/sdhc
-_description:
- PURPOSE:
-     This test will check your system Secure Digital High Capacity (SDHC) media card support
- STEPS:
-     1. Plug a SDHC media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/sdhc_after_suspend
-depends: suspend/suspend_advanced mediacard/sdhc
-_description:
-     This test will check your system Secure Digital High Capacity (SDHC) media card support after suspend
- STEPS:
-     1. Plug a SDHC media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/mmc
-_description:
- PURPOSE:
-     This test will check your system Multi Media Card (MMC) media card support
- STEPS:
-     1. Plug a MMC media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/mmc_after_suspend
-depends: suspend/suspend_advanced mediacard/mmc
-_description:
- PURPOSE:
-     This test will check your system Multi Media Card (MMC) media card support after suspend
- STEPS:
-     1. Plug a MMC media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/ms
-_description:
- PURPOSE:
-     This test will check your system Memory Stick (MS) media card support
- STEPS:
-     1. Plug a MS media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/ms_after_suspend
-depends: suspend/suspend_advanced mediacard/ms
-_description:
- PURPOSE:
-     This test will check your system Memory Stick (MS) media card support after suspend
- STEPS:
-     1. Plug a MS media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/msp
-_description:
- PURPOSE:
-     This test will check your system Memory Stick Pro (MSP) media card support
- STEPS:
-     1. Plug a MSP media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/msp_after_suspend
-depends: suspend/suspend_advanced mediacard/msp
-_description:
- PURPOSE:
-     This test will check your system Memory Stick Pro (MSP) media card support after suspend
- STEPS:
-     1. Plug a MSP media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/cf
-_description:
- PURPOSE:
-     This test will check your system Compact Flash (CF) media card support
- STEPS:
-     1. Plug a CF media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
-
-plugin: manual
-name: mediacard/cf_after_suspend
-depends: suspend/suspend_advanced mediacard/cf
-_description:
-     This test will check your system Compact Flash (CF) media card support after suspend
- STEPS:
-     1. Plug a CF media card into the computer
-     2. An icon should appear on the Launcher
-     3. Right click on the Launcher icon and select "Safely Remove Drive"
-     4. The icon should disappear from the Launcher
- VERIFICATION:
-     Does the icon automatically appear/disappear?
+name: mediacard/mmc-insert
+command: removable_storage_watcher insert sdio
+_description:
+ PURPOSE:
+     This test will check that the systems media card reader can
+     detect the insertion of a Secure Digital High-Capacity (SDHC) media card
+ STEPS:
+     1. Click "Test" and insert an SDHC card into the reader.
+        (Note: this test will time-out after 10 seconds.)
+     2. Do not unplug the device after the test.
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: shell
+name: mediacard/mmc-storage
+depends: mediacard/mmc-insert
+command: removable_storage_test sdio
+_description:
+ This test is automated and executes after the mediacard/sd-insert
+ test is run. It tests reading and writing to the SDHC card.
+
+plugin: manual
+name: mediacard/mmc-remove
+depends: mediacard/mmc-storage
+command: removable_storage_watcher remove sdio
+_description:
+ PURPOSE:
+     This test will check that the system correctly detects 
+     the removal of a Secure Digital High-Capacity (SDHC) card from the systems
+     card reader.
+ STEPS:
+     1. Click "Test" and remove the SDHC card from the reader.
+        (Note: this test will time-out after 10 seconds.)
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: manual
+name: mediacard/mmc-insert-after-suspend
+depends: suspend/suspend_advanced
+command: removable_storage_watcher insert sdio
+_description:
+ PURPOSE:
+     This test will check that the systems media card reader can
+     detect the insertion of a Secure Digital High-Capacity (SDHC)
+     media card after the system has been suspended
+ STEPS:
+     1. Click "Test" and insert an SDHC card into the reader.
+        (Note: this test will time-out after 10 seconds.)
+     2. Do not unplug the device after the test.
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: shell
+name: mediacard/mmc-storage-after-suspend
+depends: mediacard/mmc-insert-after-suspend
+command: removable_storage_test sdio
+_description:
+ This test is automated and executes after the mediacard/sd-insert-after-suspend test
+ is run. It tests reading and writing to the SDHC card after the system has been suspended.
+
+plugin: manual
+name: mediacard/mmc-remove-after-suspend
+depends: mediacard/mmc-storage-after-suspend
+command: removable_storage_watcher remove sdio
+_description:
+ PURPOSE:
+     This test will check that the system correctly detects the removal
+     of a Secure Digital High-Capacity (SDHC) card from the systems
+     card reader after the system has been suspended.
+ STEPS:
+     1. Click "Test" and remove the SDHC card from the reader.
+        (Note: this test will time-out after 10 seconds.)
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: manual
+name: mediacard/sd-insert
+command: removable_storage_watcher insert sdio
+_description:
+ PURPOSE:
+     This test will check that the systems media card reader can
+     detect the insertion of a Secure Digital (SD) media card
+ STEPS:
+     1. Click "Test" and insert an SD card into the reader.
+        (Note: this test will time-out after 10 seconds.)
+     2. Do not unplug the device after the test.
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: shell
+name: mediacard/sd-storage
+depends: mediacard/sd-insert
+command: removable_storage_test sdio
+_description:
+ This test is automated and executes after the mediacard/sd-insert
+ test is run. It tests reading and writing to the SD card.
+
+plugin: manual
+name: mediacard/sd-remove
+depends: mediacard/sd-storage
+command: removable_storage_watcher remove sdio
+_description:
+ PURPOSE:
+     This test will check that the system correctly detects 
+     the removal of a Secure Digital (SD) card from the systems
+     card reader.
+ STEPS:
+     1. Click "Test" and remove the SD card from the reader.
+        (Note: this test will time-out after 10 seconds.)
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: manual
+name: mediacard/sd-insert-after-suspend
+depends: suspend/suspend_advanced
+command: removable_storage_watcher insert sdio
+_description:
+ PURPOSE:
+     This test will check that the systems media card reader can
+     detect the insertion of a Secure Digital (SD) media card after
+     the system has been suspended
+ STEPS:
+     1. Click "Test" and insert an SD card into the reader.
+        (Note: this test will time-out after 10 seconds.)
+     2. Do not unplug the device after the test.
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: shell
+name: mediacard/sd-storage-after-suspend
+depends: mediacard/sd-insert-after-suspend
+command: removable_storage_test sdio
+_description:
+ This test is automated and executes after the mediacard/sd-insert-after-suspend test
+ is run. It tests reading and writing to the SD card after the system has been suspended.
+
+plugin: manual
+name: mediacard/sd-remove-after-suspend
+depends: mediacard/sd-storage-after-suspend
+command: removable_storage_watcher remove sdio
+_description:
+ PURPOSE:
+     This test will check that the system correctly detects 
+     the removal of a Secure Digital (SD) card from the systems
+     card reader after the system has been suspended.
+ STEPS:
+     1. Click "Test" and remove the SD card from the reader.
+        (Note: this test will time-out after 10 seconds.)
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: manual
+name: mediacard/sdhc-insert
+command: removable_storage_watcher insert sdio
+_description:
+ PURPOSE:
+     This test will check that the systems media card reader can
+     detect the insertion of a Secure Digital High-Capacity (SDHC) media card
+ STEPS:
+     1. Click "Test" and insert an SDHC card into the reader.
+        (Note: this test will time-out after 10 seconds.)
+     2. Do not unplug the device after the test.
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: shell
+name: mediacard/sdhc-storage
+depends: mediacard/sdhc-insert
+command: removable_storage_test sdio
+_description:
+ This test is automated and executes after the mediacard/sd-insert
+ test is run. It tests reading and writing to the SDHC card.
+
+plugin: manual
+name: mediacard/sdhc-remove
+depends: mediacard/sdhc-storage
+command: removable_storage_watcher remove sdio
+_description:
+ PURPOSE:
+     This test will check that the system correctly detects 
+     the removal of a Secure Digital High-Capacity (SDHC) card from the systems
+     card reader.
+ STEPS:
+     1. Click "Test" and remove the SDHC card from the reader.
+        (Note: this test will time-out after 10 seconds.)
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: manual
+name: mediacard/sdhc-insert-after-suspend
+depends: suspend/suspend_advanced
+command: removable_storage_watcher insert sdio
+_description:
+ PURPOSE:
+     This test will check that the systems media card reader can
+     detect the insertion of a Secure Digital High-Capacity (SDHC)
+     media card after the system has been suspended
+ STEPS:
+     1. Click "Test" and insert an SDHC card into the reader.
+        (Note: this test will time-out after 10 seconds.)
+     2. Do not unplug the device after the test.
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: shell
+name: mediacard/sdhc-storage-after-suspend
+depends: mediacard/sdhc-insert-after-suspend
+command: removable_storage_test sdio
+_description:
+ This test is automated and executes after the mediacard/sd-insert-after-suspend test
+ is run. It tests reading and writing to the SDHC card after the system has been suspended.
+
+plugin: manual
+name: mediacard/sdhc-remove-after-suspend
+depends: mediacard/sdhc-storage-after-suspend
+command: removable_storage_watcher remove sdio
+_description:
+ PURPOSE:
+     This test will check that the system correctly detects the removal
+     of a Secure Digital High-Capacity (SDHC) card from the systems
+     card reader after the system has been suspended.
+ STEPS:
+     1. Click "Test" and remove the SDHC card from the reader.
+        (Note: this test will time-out after 10 seconds.)
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: manual
+name: mediacard/cf-insert
+command: removable_storage_watcher insert sdio
+_description:
+ PURPOSE:
+     This test will check that the systems media card reader can
+     detect the insertion of a Secure Digital High-Capacity (SDHC) media card
+ STEPS:
+     1. Click "Test" and insert an SDHC card into the reader.
+        (Note: this test will time-out after 10 seconds.)
+     2. Do not unplug the device after the test.
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: shell
+name: mediacard/cf-storage
+depends: mediacard/cf-insert
+command: removable_storage_test sdio
+_description:
+ This test is automated and executes after the mediacard/sd-insert
+ test is run. It tests reading and writing to the SDHC card.
+
+plugin: manual
+name: mediacard/cf-remove
+depends: mediacard/cf-storage
+command: removable_storage_watcher remove sdio
+_description:
+ PURPOSE:
+     This test will check that the system correctly detects 
+     the removal of a Secure Digital High-Capacity (SDHC) card from the systems
+     card reader.
+ STEPS:
+     1. Click "Test" and remove the SDHC card from the reader.
+        (Note: this test will time-out after 10 seconds.)
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: manual
+name: mediacard/cf-insert-after-suspend
+depends: suspend/suspend_advanced
+command: removable_storage_watcher insert sdio
+_description:
+ PURPOSE:
+     This test will check that the systems media card reader can
+     detect the insertion of a Secure Digital High-Capacity (SDHC)
+     media card after the system has been suspended
+ STEPS:
+     1. Click "Test" and insert an SDHC card into the reader.
+        (Note: this test will time-out after 10 seconds.)
+     2. Do not unplug the device after the test.
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.
+
+plugin: shell
+name: mediacard/cf-storage-after-suspend
+depends: mediacard/cf-insert-after-suspend
+command: removable_storage_test sdio
+_description:
+ This test is automated and executes after the mediacard/sd-insert-after-suspend test
+ is run. It tests reading and writing to the SDHC card after the system has been suspended.
+
+plugin: manual
+name: mediacard/cf-remove-after-suspend
+depends: mediacard/cf-storage-after-suspend
+command: removable_storage_watcher remove sdio
+_description:
+ PURPOSE:
+     This test will check that the system correctly detects the removal
+     of a Secure Digital High-Capacity (SDHC) card from the systems
+     card reader after the system has been suspended.
+ STEPS:
+     1. Click "Test" and remove the SDHC card from the reader.
+        (Note: this test will time-out after 10 seconds.)
+ VERIFICATION:
+     The verification of this test is automated. Do not change the
+     automatically selected result.

=== modified file 'jobs/memory.txt.in'
--- jobs/memory.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/memory.txt.in	2012-02-01 21:26:27 +0000
@@ -1,15 +1,10 @@
-plugin: manual
+plugin: shell
 name: memory/info
-command: memory_info
+user: root
+command: memory_compare
 _description:
- PURPOSE:
-     This test checks the amount of memory that is detected
- STEPS:
-     1. Click Test to see the amount of detected memory
- INFO:
-     $output
- VERIFICATION:
-     Is the amount of detected memory correct?
+ This test checks the amount of memory which is reporting in meminfo against
+ the size of the memory modules detected by DMI.
 
 plugin: shell
 name: memory/check

=== modified file 'jobs/miscellanea.txt.in'
--- jobs/miscellanea.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/miscellanea.txt.in	2012-02-01 21:26:27 +0000
@@ -37,13 +37,12 @@
 _description:
  This will run some basic connectivity tests against a BMC, verifying that IPMI works.
 
-plugin: manual
+plugin: shell
 name: miscellanea/is_laptop
+user: root
 _description:
- PURPOSE:
-    This is to determine if we need to run tests specific to portable computers that may not apply to desktops.
- STEPS:
-    Select "Yes" if your system is a laptop or netbook. Otherwise, select "No"
+    Determine if we need to run tests specific to portable computers that may not apply to desktops.
+command: check_is_laptop
 
 plugin: shell
 name: miscellanea/apport-directory

=== modified file 'jobs/monitor.txt.in'
--- jobs/monitor.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/monitor.txt.in	2012-02-01 21:26:27 +0000
@@ -1,5 +1,6 @@
 plugin: manual
 name: monitor/vga
+requires: display.vga == 'supported'
 _description:
  PURPOSE:
      This test will check your VGA port. Skip if your system does not have a VGA port.
@@ -10,6 +11,7 @@
 
 plugin: manual
 name: monitor/dvi
+requires: display.dvi == 'supported'
 _description:
  PURPOSE:
      This test will check your DVI port. Skip if your system does not have a DVI port
@@ -20,6 +22,7 @@
 
 plugin: manual
 name: monitor/displayport
+requires: display.dp == 'supported'
 _description:
  PURPOSE:
      This test will check your DisplayPort port. Skip if your system does not have a DisplayPort port
@@ -30,6 +33,7 @@
 
 plugin: manual
 name: monitor/hdmi
+requires: display.hdmi == 'supported'
 _description:
  PURPOSE:
      This test will check your HDMI port. Skip if your system does not have a HDMI port
@@ -40,6 +44,7 @@
 
 plugin: manual
 name: monitor/svideo
+requires: display.svideo == 'supported'
 _description:
  PURPOSE:
      This test will check your S-VIDEO port. Skip if your system does not have a S-VIDEO port
@@ -50,6 +55,7 @@
 
 plugin: manual
 name: monitor/rca
+requires: display.rca == 'supported'
 _description:
  PURPOSE:
      This test will check your RCA port. Skip if your system does not have a RCA port

=== modified file 'jobs/networking.txt.in'
--- jobs/networking.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/networking.txt.in	2012-02-01 21:26:27 +0000
@@ -1,7 +1,7 @@
 plugin: shell
 name: networking/detect
 requires: device.category == 'NETWORK' or device.category == 'WIRELESS'
-command: network_test
+command: network_device_info
 _description: Test to detect the available network controllers
 
 plugin: shell 
@@ -30,6 +30,15 @@
   VERIFICATION:
       Is this correct?
 
+plugin: shell 
+name: networking/info_automated
+requires: 
+ package.name == 'network-manager'
+ device.category == 'NETWORK'
+command: udev_resource | filter_templates -w "category=WIRELESS" -w "category=NETWORK"| awk "/path: / { print \$2 }"| xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do network_info \$i; done"
+_description:
+ This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
+
 plugin: manual
 name: networking/wired_connection
 command: network_check
@@ -102,7 +111,7 @@
  name: networking/multi_nic_$2
  requires: device.path == "$1" and package.name == 'linux'
  user: root
- command: dhclient $2; internet_test --interface=$2 --deadline=15
+ command: dhclient $2; network_bandwidth_test --interface=$2 --scan=3 --log-level=debug
  description:
   Testing for NIC $2
  EOF

=== modified file 'jobs/optical.txt.in'
--- jobs/optical.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/optical.txt.in	2012-02-01 21:26:27 +0000
@@ -23,8 +23,7 @@
   PURPOSE:
       This test will check your optical devices
   STEPS:
-      1. Insert appropriate non-blank media into your optical drive(s)
-      2. Click "Test" to automatically test reading
+      1. Insert appropriate non-blank media into your optical drive(s). Movie and Audio Disks may not work. Self-created data disks have the greatest chance of working.
   VERIFICATION:
       Did it read correctly?
  EOF

=== modified file 'jobs/panel_clock_test.txt.in'
--- jobs/panel_clock_test.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/panel_clock_test.txt.in	2012-02-01 21:26:27 +0000
@@ -17,7 +17,7 @@
  PURPOSE:
     This test will verify that the desktop clock synchronizes with the system clock.
  STEPS:
-    1. Click the "Test" button and verify the clock moves ahead by 1 hour. \
+    1. Click the "Test" button and verify the clock moves ahead by 1 hour. 
     Note: It may take a minute or so for the clock to refresh 
     2. Right click on the clock, then click on "Time & Date Settings..."
     3. Ensure that your clock application is set to manual.

=== modified file 'jobs/resource.txt.in'
--- jobs/resource.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/resource.txt.in	2012-02-01 21:26:27 +0000
@@ -53,3 +53,12 @@
 plugin: resource
 command: uname_resource
 description: Creates resource info from uname output
+
+name: sleep
+plugin: resource
+command: for state in `cat /sys/power/state`; do echo "$state: supported"; done
+description: Create resource info for supported sleep states
+
+name: display
+plugin: resource
+command: for display in `xrandr | grep connected | awk '{print $1}' | grep -o ^[A-Z]* | sort | uniq`; do echo "$display: supported"; done

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/suspend.txt.in	2012-02-01 21:26:27 +0000
@@ -1,4 +1,10 @@
 plugin: shell
+name: suspend/network_before_suspend
+depends: networking/detect
+_description: Record the current network before suspending.
+command: internet_test | tee $CHECKBOX_DATA/network_before_suspend.txt
+
+plugin: shell
 name: suspend/resolution_before_suspend
 _description: Record the current resolution before suspending.
 command: xrandr -q |grep '*'| awk '{print $1}' > $CHECKBOX_DATA/resolution_before_suspend.txt
@@ -29,6 +35,16 @@
 plugin: shell
 name: suspend/wireless_before_suspend
 depends: wireless/wireless_connection
+requires: device.category == 'WIRELESS'
+command: nmcli -t -f UUID con status > $CHECKBOX_DATA/connections && connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
+_description:
+ This test disconnects all connections and then connects to the wireless
+ interface. It then checks the connection to confirm it's working as expected.
+
+plugin: shell
+name: suspend/wireless_before_suspend_auto
+depends: wireless/wireless_connection_wpa_bg
+requires: device.category == 'WIRELESS'
 command: nmcli -t -f UUID con status > $CHECKBOX_DATA/connections && connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
 _description:
  This test disconnects all connections and then connects to the wireless
@@ -36,14 +52,18 @@
 
 plugin: shell
 name: suspend/bluetooth_obex_before_suspend
-requires: package.name == 'bluez' and package.name == 'obexd-client'
+requires:
+ package.name == 'bluez' and package.name == 'obexd-client'
+ device.category == 'BLUETOOTH'
 command: obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: manual
 name: suspend/bluetooth_obex_before_suspend_manual
-requires: package.name == 'bluez' and package.name == 'obexd-client'
+requires:
+ package.name == 'bluez' and package.name == 'obexd-client'
+ device.category == 'BLUETOOTH'
 command: obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  PURPOSE:
@@ -56,7 +76,7 @@
 
 plugin: manual
 name: suspend/suspend_advanced
-depends: power-management/rtc networking/detect suspend/resolution_before_suspend suspend/wireless_before_suspend bluetooth/detect-output suspend/cpu_before_suspend suspend/memory_before_suspend
+depends: power-management/rtc suspend/network_before_suspend suspend/resolution_before_suspend suspend/wireless_before_suspend bluetooth/detect-output suspend/cpu_before_suspend suspend/memory_before_suspend
 requires: package.name == 'pm-utils'
 user: root
 command: sleep_test -d
@@ -72,9 +92,9 @@
 
 plugin: shell
 name: suspend/network_after_suspend
-depends: suspend/suspend_advanced networking/detect
+depends: suspend/suspend_advanced networking/network_before_suspend
 _description: Test the network after resuming.
-command: internet_test
+command: network_wait; internet_test | diff $CHECKBOX_DATA/network_before_suspend.txt -
 
 plugin: shell
 name: suspend/resolution_after_suspend
@@ -100,6 +120,14 @@
 command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
 
 plugin: shell
+name: suspend/cpu_after_suspend_auto
+requires:
+ package.name == 'linux'
+depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend
+_description: Verify that all CPUs are online after resuming.
+command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
+
+plugin: shell
 name: suspend/memory_after_suspend
 requires:
  package.name == 'linux'
@@ -108,6 +136,15 @@
  Verify that all memory is available after resuming from suspend.
 command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
 
+plugin: shell
+name: suspend/memory_after_suspend_auto
+requires:
+ package.name == 'linux'
+depends: suspend/suspend_advanced_auto suspend/memory_before_suspend
+_description:
+ Verify that all memory is available after resuming from suspend.
+command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
+
 plugin: manual
 name: suspend/display_after_suspend
 requires:
@@ -122,6 +159,17 @@
 plugin: shell
 name: suspend/wireless_after_suspend
 depends: suspend/suspend_advanced suspend/wireless_before_suspend
+requires: device.category == 'WIRELESS'
+command: connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
+_description:
+ This test checks that the wireless interface is working after suspending the system. It
+ disconnects all interfaces and then connects to the wireless interface and checks that the
+ connection is working as expected.
+
+plugin: shell
+name: suspend/wireless_after_suspend_auto
+depends: suspend/suspend_advanced_auto suspend/wireless_before_suspend_auto
+requires: device.category == 'WIRELESS'
 command: connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
 _description:
  This test checks that the wireless interface is working after suspending the system. It
@@ -131,7 +179,9 @@
 plugin: shell
 name: suspend/bluetooth_detect_after_suspend
 depends: suspend/suspend_advanced bluetooth/detect-output
-requires: package.name == 'bluez'
+requires:
+ package.name == 'bluez'
+ device.category == 'BLUETOOTH'
 command: hcitool dev | tail -n+2 | awk '{print $2}' |diff $CHECKBOX_DATA/bluetooth_address -
 _description:
  This test grabs the hardware address of the bluetooth adapter after suspend and compares it to the address grabbed before suspend.
@@ -139,7 +189,9 @@
 plugin: shell
 name: suspend/bluetooth_obex_after_suspend
 depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend
-requires: package.name == 'bluez' and package.name == 'obexd-client'
+requires:
+ package.name == 'bluez' and package.name == 'obexd-client'
+ device.category == 'BLUETOOTH'
 command: obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
@@ -147,7 +199,9 @@
 plugin: manual
 name: suspend/bluetooth_obex_after_suspend_manual
 depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend_manual
-requires: package.name == 'bluez' and package.name == 'obexd-client'
+requires:
+ package.name == 'bluez' and package.name == 'obexd-client'
+ device.category == 'BLUETOOTH'
 command: obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
  PURPOSE:
@@ -183,22 +237,9 @@
 plugin: attachment
 name: suspend/xrandr_screens_after_suspend.tar.gz
 depends: suspend/cycle_resolutions_after_suspend_auto
-command: [ -e $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz ] && cat $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz 
+command: [ -e $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz ] && cat $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend_auto test to the results submission.
 
-plugin: manual
-name: suspend/usb_storage_after_suspend
-depends: suspend/suspend_advanced
-command: usb_test -t
-_description:
- PURPOSE:
-     This will test that USB functionality is restored after a suspend and resume cycle
- STEPS:
-     1. Plug in at least one USB storage device if one is not already connected
-     2. Click "Test" to start
- VERIFICATION:
-     Automatically verified
-
 plugin: shell
 name: suspend/record_playback_after_suspend
 depends: suspend/suspend_advanced
@@ -212,16 +253,18 @@
 
 plugin: shell
 name: suspend/suspend_advanced_auto
-depends: power-management/rtc networking/detect suspend/cpu_before_suspend suspend/memory_before_suspend
-requires: package.name == 'pm-utils'
+depends: power-management/rtc suspend/network_before_suspend suspend/cpu_before_suspend suspend/memory_before_suspend suspend/wireless_before_suspend_auto
+requires:
+    package.name == 'pm-utils'
+    sleep.mem == 'supported'
 _description:
- This is the automated version of suspend/suspend_advanced. 
+ This is the automated version of suspend/suspend_advanced.
 user: root
 command: sleep_test -d
 
 plugin: shell
 name: suspend/wake_on_lan
-depends: power-management/rtc suspend/suspend_advanced 
+depends: power-management/rtc suspend/suspend_advanced
 requires: package.name == 'pm-utils' and package.name == 'util-linux'
 _description:
  This automatically tests Wake-on-LAN capability with the aid of a suitably configured server. During this process the system will suspend, then automatically wake up after no more than 5 minutes.

=== modified file 'jobs/usb.txt.in'
--- jobs/usb.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/usb.txt.in	2012-02-01 21:26:27 +0000
@@ -8,10 +8,10 @@
 name: usb/disk_detect
 depends: usb/detect
 requires: package.name == 'linux'
-command: usb_test -l
+command: removable_storage_test -l usb
 _description:
  PURPOSE:
-     This test will check your USB connection.
+     This test will check that your system detects USB storage devices.
  STEPS:
      1. Plug in one or more USB keys or hard drives.
      2. Click on "Test".
@@ -51,34 +51,40 @@
 name: usb/insert
 depends: usb/detect
 requires: package.name == 'linux'
-command: watch_command -q -r 5 lsusb
+command: removable_storage_watcher insert usb
 _description:
  PURPOSE:
-     This test will check your USB connection.
+     This test will check that the system correctly detects the insertion of
+     a USB storage device
  STEPS:
-     1. Click "Test" and insert a USB device within 5 seconds.
+     1. Click "Test" and insert a USB storage device (pen-drive/HDD).
+        (Note: this test will time-out after 10 seconds.)
      2. Do not unplug the device after the test.
  VERIFICATION:
-     The verification of this test is automated.
+     The verification of this test is automated. Do not change the
+     automatically selected result.
 
 plugin: manual
 name: usb/remove
-depends: usb/insert
+depends: usb/storage-automated
 requires: package.name == 'linux'
-command: watch_command -q -r 5 lsusb
+command: removable_storage_watcher remove usb
 _description:
  PURPOSE:
-     This test will check your USB connection.
+     This test will check that the system correctly detects the removal of
+     a USB storage device
  STEPS:
-     1. Click "Test" and remove the USB device within 5 seconds.
-     2. Do not unplug the device after the test.
+     1. Click "Test" and remove the USB device.
+        (Note: this test will time-out after 10 seconds.)
  VERIFICATION:
-     The verification of this test is automated.
+     The verification of this test is automated. Do not change the
+     automatically selected result.
 
 plugin: manual
 name: usb/storage-transfer
 requires: package.name == 'linux'
-command: usb_test -t
+depends: usb/insert
+command: removable_storage_test usb
 _description:
  PURPOSE:
      This test will check your USB connection.
@@ -87,14 +93,25 @@
      2. An icon should appear on the Launcher.
      3. Click "Test" to begin the test.
  VERIFICATION:
-     The verification of this test is automated.
+     The verification of this test is automated. Do not change the
+     automatically selected result.
 
 plugin: shell
 name: usb/storage-automated
 requires: package.name == 'linux'
-command: usb_test -t
-_description:
- This test is automated and requires that you plug in at least one usb storage device before running checkbox.
+depends: usb/insert
+command: removable_storage_test usb
+_description:
+ This test is automated and executes after the usb/insert test is run.
+
+plugin: shell
+name: usb/storage-preinserted
+requires: package.name == 'linux'
+command: removable_storage_test -l usb && removable_storage_test usb
+_description:
+ This is an automated version of usb/storage-automated and assumes that the 
+ server has usb storage devices plugged in prior to checkbox execution. It 
+ is intended for servers and SRU automated testing.
 
 plugin: manual
 name: usb/panels

=== modified file 'jobs/user_apps.txt.in'
--- jobs/user_apps.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/user_apps.txt.in	2012-02-01 21:26:27 +0000
@@ -21,7 +21,7 @@
 command: nautilus
 _description:
  PURPOSE:
-  This test will check that the file broswer can create a new folder.
+  This test will check that the file browser can create a new folder.
  STEPS:
   1. Click Test to open the File Browser. 
   2. On the menu bar, click File -> Create Folder. 
@@ -283,7 +283,7 @@
 _description:
  PURPOSE:
   This test will check that Firefox can play a Quicktime (.mov) video file.
-  Note: this may require installing additonal software to successfully
+  Note: this may require installing additional software to successfully
   complete.
  STEPS:
   1. Select Test to launch Firefox with a sample video.

=== modified file 'jobs/wireless.txt.in'
--- jobs/wireless.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/wireless.txt.in	2012-02-01 21:26:27 +0000
@@ -18,3 +18,65 @@
      3. Click "Test" to verify that it's possible to establish an HTTP connection.
  VERIFICATION:
      Did a notification show and was the connection correctly established?
+
+plugin: shell
+name: wireless/wireless_connection_wpa_bg
+requires: device.category == 'WIRELESS'
+user: root
+environ: WPA_BG_SSID WPA_BG_PSK
+command: create_connection $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`; rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID
+_description:
+ Tests that the systems wireless hardware can connect to a router using WPA
+ security and the 802.11b/g protocols.
+
+plugin: shell
+name: wireless/wireless_connection_open_bg
+requires: device.category == 'WIRELESS'
+user: root
+environ: OPEN_BG_SSID
+command: create_connection $OPEN_BG_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`; rm -f /etc/NetworkManager/system-connections/$OPEN_BG_SSID
+_description:
+ Tests that the systems wireless hardware can connect to a router using no
+ security and the 802.11b/g protocols.
+
+plugin: shell
+name: wireless/wireless_connection_wpa_n
+requires: device.category == 'WIRELESS'
+user: root
+environ: WPA_N_SSID WPA_N_PSK
+command: create_connection $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`; rm -f /etc/NetworkManager/system-connections/$WPA_N_SSID
+_description:
+ Tests that the systems wireless hardware can connect to a router using WPA
+ security and the 802.11n protocol.
+
+plugin: shell
+name: wireless/wireless_connection_open_n
+requires: device.category == 'WIRELESS'
+user: root
+environ: OPEN_N_SSID
+command: create_connection $OPEN_N_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`; rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID
+_description:
+ Tests that the systems wireless hardware can connect to a router using no
+ security and the 802.11n protocol.
+
+plugin: shell
+name: wireless/monitor_wireless_connection
+requires:
+ package.name == 'iperf'
+ device.category == 'WIRELESS'
+user: root
+environ: WPA_BG_SSID WPA_BG_PSK SERVER_IPERF
+command: create_connection $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK && ifconfig eth0 down; iperf -c $SERVER_IPERF -t 300 -i 30; ifconfig eth0 up; rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID
+_description:
+ Tests the performance of a systems wireless connection through the iperf tool.
+
+plugin: shell
+name: wireless/monitor_wireless_connection_udp
+requires:
+ package.name == 'iperf'
+ device.category == 'WIRELESS'
+user: root
+environ: WPA_BG_SSID WPA_BG_PSK SERVER_IPERF
+command: create_connection $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK && ifconfig eth0 down; iperf -c $SERVER_IPERF -t 300 -i 30 -u -b 100m -p 5050; ifconfig eth0 up; rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID
+_description:
+ Tests the performance of a systems wireless connection through the iperf tool, using UDP packets.

=== modified file 'plugins/apport_prompt.py'
--- plugins/apport_prompt.py	2011-11-18 12:46:21 +0000
+++ plugins/apport_prompt.py	2012-02-01 21:26:27 +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/backend_info.py'
--- plugins/backend_info.py	2011-08-10 21:09:56 +0000
+++ plugins/backend_info.py	2012-02-01 21:26:27 +0000
@@ -113,6 +113,16 @@
 
     def message_exec(self, message):
         if "user" in message:
+            if "environ" in message:
+                #Prepare variables to be "exported" from my environment
+                #to the backend's.
+                backend_environ=["%s=%s" % (key, os.environ[key])
+                             for key in message["environ"] 
+                             if key in os.environ]
+                message=dict(message) #so as to not wreck the
+                                      #original message
+                message["environ"]=backend_environ
+
             if (self.backend_is_alive and not self.ping_backend()):
                 self.backend_is_alive = False
 

=== modified file 'plugins/intro_prompt.py'
--- plugins/intro_prompt.py	2011-09-29 13:12:01 +0000
+++ plugins/intro_prompt.py	2012-02-01 21:26:27 +0000
@@ -19,14 +19,13 @@
 from gettext import gettext as _
 
 from checkbox.plugin import Plugin
+from checkbox.properties import String
 from checkbox.user_interface import PREV
 
 
 class IntroPrompt(Plugin):
 
-    def register(self, manager):
-        super(IntroPrompt, self).register(manager)
-        self._welcome_text = _("""\
+    welcome_text = String(default=_("""\
 Welcome to System Testing!
 
 Checkbox provides tests to confirm that your system is working \
@@ -36,7 +35,10 @@
 Warning: Some tests could cause your system to freeze \
 or become unresponsive. Please save all your work \
 and close all other running applications before \
-beginning the testing process.""")
+beginning the testing process."""))
+
+    def register(self, manager):
+        super(IntroPrompt, self).register(manager)
 
         self._recover = False
 
@@ -51,7 +53,7 @@
     def prompt_begin(self, interface):
         if interface.direction == PREV or not self._recover:
             self._recover = False
-            interface.show_text(self._welcome_text, previous="")
+            interface.show_text(self.welcome_text, previous="")
 
 
 factory = IntroPrompt

=== modified file 'plugins/jobs_prompt.py'
--- plugins/jobs_prompt.py	2011-09-14 21:16:02 +0000
+++ plugins/jobs_prompt.py	2012-02-01 21:26:27 +0000
@@ -18,7 +18,7 @@
 #
 from checkbox.contrib.persist import Persist, MemoryBackend
 
-from checkbox.job import JobStore, UNINITIATED, UNTESTED
+from checkbox.job import JobStore, PASS, UNINITIATED, UNTESTED
 from checkbox.properties import Int, Path
 from checkbox.plugin import Plugin
 from checkbox.user_interface import NEXT, PREV
@@ -55,7 +55,6 @@
         self._store = None
 
         for (rt, rh) in [
-             ("expose-msgstore", self.expose_msgstore),
              ("begin-persist", self.begin_persist),
              ("begin-recover", self.begin_recover),
              ("ignore-jobs", self.ignore_jobs),
@@ -66,9 +65,6 @@
              ("report-job", self.report_job)]:
             self._manager.reactor.call_on(rt, rh)
 
-    def expose_msgstore(self):
-        self._manager.reactor.fire("store-access", self.store)
-
     def begin_persist(self, persist):
         self._persist = persist
 
@@ -91,6 +87,19 @@
         if job[attribute] in self._ignore:
             job["status"] = UNTESTED
         else:
+            if "depends" in job:
+                offset = self.store.get_pending_offset()
+                self.store.set_pending_offset(0)
+                messages = self.store.get_pending_messages()
+                self.store.set_pending_offset(offset)
+
+                # Skip if any message in the depends doesn't pass
+                depends = job["depends"]
+                for message in messages:
+                    if message["name"] in depends \
+                       and message["status"] != PASS:
+                        return
+
             self._manager.reactor.fire("prompt-%s" % job["plugin"], interface, job)
 
     def prompt_jobs(self, interface):
@@ -122,6 +131,9 @@
         tests = [m for m in messages if m.get("type") in ("test", "metric")]
         self._manager.reactor.fire("report-tests", tests)
 
+        suites = [m for m in messages if m.get("type") == "suite"]
+        self._manager.reactor.fire("report-suites", suites)
+
         attachments = [m for m in messages if m.get("type") == "attachment" and "data" in m]
         self._manager.reactor.fire("report-attachments", attachments)
 

=== modified file 'plugins/launchpad_report.py'
--- plugins/launchpad_report.py	2011-11-18 12:46:21 +0000
+++ plugins/launchpad_report.py	2012-02-01 21:26:27 +0000
@@ -19,6 +19,7 @@
 import os
 
 from gettext import gettext as _
+from string import printable
 
 from checkbox.lib.safe import safe_make_directory
 
@@ -80,7 +81,7 @@
             elif "udev_attachment" in name:
                 self._report["hardware"]["udev"] = attachment["data"]
 
-            else:
+            elif all(c in printable for c in attachment["data"]):
                 self._report["context"].append({
                     "command": attachment["command"],
                     "data": attachment["data"]})

=== modified file 'plugins/recover_prompt.py'
--- plugins/recover_prompt.py	2011-09-14 21:16:02 +0000
+++ plugins/recover_prompt.py	2012-02-01 21:26:27 +0000
@@ -50,11 +50,13 @@
     def prompt_begin(self, interface):
         if interface.direction == NEXT \
            and self.persist.get("recover", False):
+            recover = _("Recover")
+            restart = _("Restart")
             response = interface.show_info(
                 _("Checkbox did not finish completely.\n"
                   "Do you want to recover from the previous run?"),
-                ["yes", "no"], "yes")
-            self._manager.reactor.fire("begin-recover", response == "yes")
+                [recover, restart], recover)
+            self._manager.reactor.fire("begin-recover", response == recover)
 
         self.persist.set("recover", True)
 

=== modified file 'plugins/shell_test.py'
--- plugins/shell_test.py	2011-06-13 14:22:39 +0000
+++ plugins/shell_test.py	2012-02-01 21:26:27 +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-11-18 12:46:21 +0000
+++ po/POTFILES.in	2012-02-01 21:26:27 +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

=== modified file 'po/ace.po'
--- po/ace.po	2011-08-10 21:09:56 +0000
+++ po/ace.po	2012-02-01 21:26:27 +0000
@@ -7,17 +7,17 @@
 msgstr ""
 "Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-07-07 12:32-0400\n"
+"POT-Creation-Date: 2012-01-06 12:39-0500\n"
 "PO-Revision-Date: 2011-07-19 16:37+0000\n"
 "Last-Translator: Benny Alfian <Unknown>\n"
 "Language-Team: Acehnese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-31 04:31+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2012-01-07 04:41+0000\n"
+"X-Generator: Launchpad (build 14640)\n"
 
-#: ../gtk/checkbox-gtk.ui.h:1 ../checkbox_cli/cli_interface.py:343
+#: ../gtk/checkbox-gtk.ui.h:1 ../checkbox_cli/cli_interface.py:351
 #: ../checkbox_urwid/urwid_interface.py:261
 msgid "Further information:"
 msgstr "Informasi leubeh lanjot:"
@@ -52,7 +52,7 @@
 msgid "_Skip this test"
 msgstr "_Neupeuliwat uji nyoe"
 
-#: ../gtk/checkbox-gtk.ui.h:9 ../checkbox_gtk/gtk_interface.py:522
+#: ../gtk/checkbox-gtk.ui.h:9 ../checkbox_gtk/gtk_interface.py:535
 msgid "_Test"
 msgstr "_Uji"
 
@@ -61,256 +61,267 @@
 msgstr "Ny_oe"
 
 #: ../gtk/checkbox-gtk.desktop.in.h:2
-msgid "Test and report system information"
-msgstr "Test dan sistem informasi laporan"
-
-#. description
-#: ../jobs/apport.txt.in:5
-msgid "Test that the /var/crash directory doesn't contain anything."
+msgid "Test your system and submit results to the Ubuntu Friendly project"
 msgstr ""
 
 #. description
 #: ../jobs/audio.txt.in:7
-msgid "Detecting your sound device(s):"
-msgstr "Neukaleun peurangkat su gata:"
-
-#. description
-#: ../jobs/audio.txt.in:7 ../jobs/disk.txt.in:4 ../jobs/graphics.txt.in:126
-#: ../jobs/memory.txt.in:4 ../jobs/networking.txt.in:16
-#: ../jobs/optical.txt.in:8 ../jobs/power-management.txt.in:167
-#: ../jobs/usb.txt.in:5
-msgid "$output"
-msgstr "$hasee"
-
-#. description
-#: ../jobs/audio.txt.in:7 ../jobs/bluetooth.txt.in:5 ../jobs/disk.txt.in:4
-#: ../jobs/graphics.txt.in:126 ../jobs/memory.txt.in:4
-#: ../jobs/networking.txt.in:16 ../jobs/optical.txt.in:8
-#: ../jobs/power-management.txt.in:185 ../jobs/usb.txt.in:5
-msgid "Is this correct?"
-msgstr "Peu nyoe ka beutoi?"
-
-#. description
-#: ../jobs/audio.txt.in:21
-msgid ""
-"Did you hear a sound and was that sound free of any distortion, clicks or "
-"other strange noises?"
-msgstr ""
-
-#. description
-#: ../jobs/audio.txt.in:33
-msgid "Please connect a pair of headphones to your audio device."
-msgstr "Tulong neupasang headphone u peurangkat su Gata."
-
-#. description
-#: ../jobs/audio.txt.in:33
-msgid ""
-"Select Test to play a sound on the automatically detected playback device."
-msgstr ""
-
-#. description
-#: ../jobs/audio.txt.in:33
-msgid ""
-"Did you hear a sound through the headphones and did the sound play without "
-"any distortion, clicks or other strange noises from your headphones?"
-msgstr ""
-
-#. description
-#: ../jobs/audio.txt.in:47
-msgid ""
-"Disconnect any external microphones that you have plugged in.  Select Test, "
-"then speak into your internal microphone.  After a few seconds, your speech "
-"will be played back to you."
-msgstr ""
-
-#. description
-#: ../jobs/audio.txt.in:59
-msgid ""
-"Connect a microphone to your microphone port.  Select Test, then speak into "
-"the microphone.  After a few seconds, your speech will be played back to you."
-msgstr ""
-
-#. description
-#: ../jobs/audio.txt.in:70
-msgid ""
-"Connect a USB audio device to your system.  Then open the volume control "
-"application by left-clicking on the speaker icon in the panel and selecting "
-"\"Sound Preferences\".  Select the \"Input\" tab and choose your USB device. "
-" Select the \"Output\" tab and choose your USB device.  When you are done, "
-"select Test, then speak into the microphone.  After a few seconds, your "
-"speech will be played back to you."
-msgstr ""
-
-#. description
-#: ../jobs/audio.txt.in:70 ../jobs/power-management.txt.in:221
-msgid "Did you hear your speech played back?"
-msgstr ""
-
-#. description
-#: ../jobs/audio.txt.in:81
-msgid ""
-"Play back a sound on the default output and listen for it on the \\ default "
-"input.  This makes the most sense when the output and input \\ are directly "
+msgid "Test to detect audio devices"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check that internal speakers work correctly\n"
+"STEPS:\n"
+"    1. Make sure that no external speakers or headphones are connected\n"
+"       If testing a desktop, external speakers are allowed\n"
+"    2. Click the Test button to play a brief tone on your audio device\n"
+"VERIFICATION:\n"
+"    Did you hear a tone?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that headphones connector works correctly\n"
+"STEPS:\n"
+"    1. Connect a pair of headphones to your audio device\n"
+"    2. Click the Test button to play a sound to your audio device\n"
+"VERIFICATION:\n"
+"    Did you hear a sound through the headphones and did the sound play "
+"without any distortion, clicks or other strange noises from your headphones?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will check that recording sound using the onboard microphone "
+"works correctly\n"
+"STEPS:\n"
+"    1. Disconnect any external microphones that you have plugged in\n"
+"    2. Click \"Test\", then speak into your internal microphone\n"
+"    3. After a few seconds, your speech will be played back to you.\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:66
+msgid ""
+"PURPOSE:\n"
+"    This test will check that recording sound using an external microphone "
+"works correctly\n"
+"STEPS:\n"
+"    1. Connect a microphone to your microphone port\n"
+"    2. Click \"Test\", then speak into the external microphone\n"
+"    3. After a few seconds, your speech will be played back to you\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:82
+msgid ""
+"PURPOSE:\n"
+"    This test will check that a USB audio device works correctly\n"
+"STEPS:\n"
+"    1. Connect a USB audio device to your system\n"
+"    2. Open the volume control application by left-clicking on the speaker "
+"icon in the panel and selecting \"Sound Settings\"\n"
+"    3. Select the \"Input\" tab and choose your USB device\n"
+"    4. Select the \"Output\" tab and choose your USB device\n"
+"    5. Click \"Test\", then speak into the microphone\n"
+"    6. After a few seconds, your speech will be played back to you\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back through the USB headphones?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:102
+msgid ""
+"Play back a sound on the default output and listen for it on the  default "
+"input.  This makes the most sense when the output and input  are directly "
 "connected, as with a patch cable."
 msgstr ""
 
 #. description
-#: ../jobs/autotest.txt.in:3
-msgid "Autotest suite (destructive)"
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:5 ../jobs/power-management.txt.in:185
-msgid "The address of your Bluetooth device is: $output"
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:15 ../jobs/graphics.txt.in:15
-msgid "Automated test to store output in checkbox report"
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:21
-msgid ""
-"Bluetooth browse files procedure: 1.- Enable bluetooth on any mobile device "
-"(PDA, smartphone, etc.) 2.- Click on the bluetooth icon in the menu bar 3.- "
-"Select 'Setup new device' 3.- Look for the device in the list and select it "
-"4.- In the device write the PIN code automatically chosen by the wizard 5.- "
-"The device should pair with the computer 6.- Right-click on the bluetooth "
-"icon and select browse files 7.- Authorize the computer to browse the files "
-"in the device if needed 8.- You should be able to browse the files"
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:38
-msgid ""
-"Bluetooth file transfer procedure: 1.- Make sure that you're able to browse "
-"the files in your mobile device 2.- Copy a file from the computer to the "
-"mobile device 3.- Verify that the file was correctly copied 4.- Copy a file "
-"from the mobile device to the computer 5.- Verify that the file was "
-"correctly copied"
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:53
-msgid ""
-"Bluetooth audio procedure: 1.- Enable the bluetooth headset 2.- Click on the "
-"bluetooth icon in the menu bar 3.- Select 'Setup new device' 4.- Look for "
-"the device in the list and select it 5.- In the device write the PIN code "
-"automatically chosen by the wizard 6.- The device should pair with the "
-"computer 7.- Select Test to record for five seconds and reproduce in the "
-"bluetooth device"
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:69
-msgid ""
-"Bluetooth keyboard procedure: 1.- Enable the bluetooth keyboard 2.- Click on "
-"the bluetooth icon in the menu bar 3.- Select 'Setup new device' 4.- Look "
-"for the device in the list and select it 5.- Select Test to enter text"
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:82
-msgid ""
-"Bluetooth mouse procedure: 1.- Enable the bluetooth mouse 2.- Click on the "
-"bluetooth icon in the menu bar 3.- Select 'Setup new device' 4.- Look for "
-"the device in the list and select it 5.- Move the mouse around the screen 6.-"
-" Perform some single/double/right click operations"
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:82 ../jobs/optical.txt.in:72
-#: ../jobs/power-management.txt.in:194 ../jobs/usb.txt.in:27
-msgid "Did all the steps work?"
+#: ../jobs/autotest.txt.in:6
+msgid ""
+"PURPOSE:\n"
+"   This test will attempt to install and run the Autotest Suite.  These "
+"tests can be destructive, so this test is blacklisted by default."
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:7
+msgid ""
+"This test will detect your Bluetooth device and output the device's hardware "
+"address.  If no device is found, the test will exit with an error."
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:16
+msgid ""
+"Automated test to store bluetooth device information in checkbox report"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:22
+msgid ""
+"PURPOSE:\n"
+"    This test will check that bluetooth connection works correctly\n"
+"STEPS:\n"
+"    1. Enable bluetooth on any mobile device (PDA, smartphone, etc.)\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. In the device write the PIN code automatically chosen by the wizard\n"
+"    6. The device should pair with the computer\n"
+"    7. Right-click on the bluetooth icon and select browse files\n"
+"    8. Authorize the computer to browse the files in the device if needed\n"
+"    9. You should be able to browse the files\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:41
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can transfer information through a "
+"bluetooth connection\n"
+"STEPS:\n"
+"    1. Make sure that you're able to browse the files in your mobile device\n"
+"    2. Copy a file from the computer to the mobile device\n"
+"    3. Copy a file from the mobile device to the computer\n"
+"VERIFICATION:\n"
+"    Were all files copied correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:55
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can record and hear audio using a "
+"bluetooth audio device\n"
+"STEPS:\n"
+"    1. Enable the bluetooth headset\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. In the device write the PIN code automatically chosen by the wizard\n"
+"    6. The device should pair with the computer\n"
+"    7. Click \"Test\" to record for five seconds and reproduce in the "
+"bluetooth device\n"
+"VERIFICATION:\n"
+"    Did you hear the sound you recorded in the bluetooth"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:73
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can use a bluetooth keyboard\n"
+"STEPS:\n"
+"    1. Enable the bluetooth keyboard\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. Click \"Test\"\n"
+"    6. Enter some text\n"
+"VERIFICATION:\n"
+"    Were you able to enter some text with the bluetooth keyboard?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:89
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can use a bluetooth mouse\n"
+"STEPS:\n"
+"    1. Enable the bluetooth mouse\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. Move the mouse around the screen\n"
+"    6. Perform some single/double/right click operations\n"
+"VERIFICATION:\n"
+"    Did the mouse work as expected?"
 msgstr ""
 
 #. description
 #: ../jobs/camera.txt.in:7
-msgid "Automated test case that attempts to detect a camera"
-msgstr ""
-
-#. description
-#: ../jobs/camera.txt.in:16
-msgid "Select Test to display a video capture from the camera"
-msgstr ""
-
-#. description
-#: ../jobs/camera.txt.in:16
-msgid "Did you see the video capture?"
-msgstr ""
-
-#. description
-#: ../jobs/camera.txt.in:30
-msgid "Select Test to display a still image from the camera"
-msgstr ""
-
-#. description
-#: ../jobs/camera.txt.in:30
-msgid "Did you see the image?"
-msgstr ""
-
-#. description
-#: ../jobs/camera.txt.in:43
-msgid ""
-"Select Test to capture video to a file and open it in totem. Please make "
-"sure that both audio and video is captured."
-msgstr ""
-
-#. description
-#: ../jobs/camera.txt.in:43
-msgid "Did you see/hear the capture?"
+msgid "This Automated test attempts to detect a camera."
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the built-in camera works\n"
+"STEPS:\n"
+"    1. Click on Test to display a video capture from the camera\n"
+"VERIFICATION:\n"
+"    Did you see the video capture?"
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the built-in camera works\n"
+"STEPS:\n"
+"    1. Click on Test to display a still image from the camera\n"
+"VERIFICATION:\n"
+"    Did you see the image?"
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can capture video with the built-in "
+"camera\n"
+"STEPS:\n"
+"    1. Click on Test to capture video to a file (it will automatically open "
+"in Totem)\n"
+"VERIFICATION:\n"
+"    Did you see and hear the capture?"
 msgstr ""
 
 #. description
 #: ../jobs/codecs.txt.in:7
-msgid "Select Test to play an Ogg Vorbis file (.ogg)"
-msgstr ""
-
-#. description
-#: ../jobs/codecs.txt.in:20
-msgid "Select Test to play a Wave Audio format file (.wav)"
-msgstr ""
-
-#. description
-#: ../jobs/codecs.txt.in:20
-msgid "Did the sample play correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/codecs.txt.in:33
-msgid ""
-"Select 'Test' to play some audio, and try pausing and resuming playback "
-"while the it is playing."
-msgstr ""
-
-#. description
-#: ../jobs/codecs.txt.in:33
-msgid "Did the audio play and pause as expected?"
-msgstr ""
-
-#. description
-#: ../jobs/codecs.txt.in:46
-msgid ""
-"Select 'Test' to play a video, and try pausing and resuming playback while "
-"the video is playing."
-msgstr ""
-
-#. description
-#: ../jobs/codecs.txt.in:46
-msgid "(Please close Movie Player to proceed.)"
-msgstr ""
-
-#. description
-#: ../jobs/codecs.txt.in:46
-msgid "Did the video play and pause as expected?"
+msgid ""
+"PURPOSE:\n"
+"   This test will verify your system's ability to play Ogg Vorbis audio "
+"files.\n"
+"STEPS:\n"
+"   1. Click Test to play an Ogg Vorbis file (.ogg)\n"
+"   2. Please close the player to proceed.\n"
+"VERIFICATION:\n"
+"   Did the sample play correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/codecs.txt.in:22
+msgid ""
+"PURPOSE:\n"
+"   This test will verify your system's ability to play Wave Audio files.\n"
+"STEPS:\n"
+"   1. Select Test to play a Wave Audio format file (.wav)\n"
+"   2. Please close the player to proceed.\n"
+"VERIFICATION:\n"
+"   Did the sample play correctly?"
 msgstr ""
 
 #. description
 #: ../jobs/cpu.txt.in:8
 msgid ""
-"Test the CPU scaling capabilities using Colin King's Firmware Test Suite "
-"tool."
+"Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq)."
 msgstr ""
 
 #. description
@@ -325,12 +336,12 @@
 
 #. description
 #: ../jobs/cpu.txt.in:30
-msgid "Checks cpu topology for accuracy"
+msgid "This test checks cpu topology for accuracy"
 msgstr ""
 
 #. description
 #: ../jobs/cpu.txt.in:38
-msgid "Checks that CPU frequency governors are obeyed when set."
+msgid "This test checks that CPU frequency governors are obeyed when set."
 msgstr ""
 
 #. description
@@ -390,120 +401,89 @@
 
 #. description
 #: ../jobs/disk.txt.in:4
-msgid "The following hard drives were detected:"
+msgid "Detects and displays disks attached to the system."
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:14
+#: ../jobs/disk.txt.in:9
 msgid "Benchmark for each disk "
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:36
+#: ../jobs/disk.txt.in:26
 msgid "SMART test"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:51
+#: ../jobs/disk.txt.in:42
 msgid "Maximum disk space used during a default installation test"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:66
+#: ../jobs/disk.txt.in:57
 msgid "Verify system storage performs at or above baseline performance"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:83
+#: ../jobs/disk.txt.in:74
 msgid ""
 "Verify that storage devices, such as Fibre Channel and RAID can be detected "
 "and perform under stress."
 msgstr ""
 
 #. description
-#: ../jobs/evolution.txt.in:5
-msgid ""
-"Click the \"Test\" button to launch Evolution, then configure it to connect "
-"to a POP3 account."
-msgstr ""
-
-#. description
-#: ../jobs/evolution.txt.in:14
-msgid ""
-"Click the \"Test\" button to launch Evolution, then configure it to connect "
-"to a IMAP account."
-msgstr ""
-
-#. description
-#: ../jobs/evolution.txt.in:14
-msgid "Were you able to receive and read e-mail correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/evolution.txt.in:23
-msgid ""
-"Click the \"Test\" button to launch Evolution, then configure it to connect "
-"to a SMTP account."
-msgstr ""
-
-#. description
-#: ../jobs/evolution.txt.in:23
-msgid "Were you able to send e-mail without errors?"
-msgstr ""
-
-#. description
-#: ../jobs/fingerprint.txt.in:3
-msgid ""
-"Prerequisites: This test case assumes that there's a testing account from "
-"which test cases are run and a personal account that the tester uses to "
-"verify the fingerprint reader"
-msgstr ""
-
-#. description
-#: ../jobs/fingerprint.txt.in:3
-msgid ""
-"Fingerprint login verification procedure:\n"
-" 1.- Click on the user switcher applet.\n"
-" 2.- Select your user name.\n"
-" 3.- A window should appear that provides the ability to login either typing "
-"your password or using fingerprint authentication.\n"
-" 4.- Use the fingerprint reader to login.\n"
-" 5.- Click on the user switcher applet.\n"
-" 6.- Select the testing account to continue running tests."
-msgstr ""
-
-#. description
-#: ../jobs/fingerprint.txt.in:18
-msgid ""
-"Fingerprint unlock verification procedure:\n"
-" 1.- Click on the user switcher applet.\n"
-" 2.- Select 'Lock screen'.\n"
-" 3.- Press any key or move the mouse.\n"
-" 4.- A window should appear that provides the ability to unlock either "
-"typing your password or using fingerprint authentication.\n"
-" 5.- Use the fingerprint reader to unlock.\n"
-" 6.- Your screen should be unlocked."
-msgstr ""
-
-#. description
-#: ../jobs/fingerprint.txt.in:18
-msgid "Did the authentication procedure work correctly?"
+#: ../jobs/fingerprint.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a fingerprint reader will work properly for "
+"logging into your system.\n"
+"PREREQUISITES:\n"
+"   This test case assumes that there's a testing account from which test "
+"cases are run and a personal account that the tester uses to verify the "
+"fingerprint reader\n"
+"STEPS:\n"
+"   1. Click on the user switcher applet.\n"
+"   2. Select your user name.\n"
+"   3. A window should appear that provides the ability to login either "
+"typing your password or using fingerprint authentication.\n"
+"   4. Use the fingerprint reader to login.\n"
+"   5. Click on the user switcher applet.\n"
+"   6. Select the testing account to continue running tests.\n"
+"VERIFICATION:\n"
+"   Did the authentication procedure work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/fingerprint.txt.in:20
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a fingerprint reader can be used to unlock a "
+"locked system.\n"
+"STEPS:\n"
+"   1. Click on the user switcher applet.\n"
+"   2. Select 'Lock screen'.\n"
+"   3. Press any key or move the mouse.\n"
+"   4. A window should appear that provides the ability to unlock either "
+"typing your password or using fingerprint authentication.\n"
+"   5. Use the fingerprint reader to unlock.\n"
+"   6. Your screen should be unlocked.\n"
+"VERIFICATION:\n"
+"   Did the authentication procedure work correctly?"
 msgstr ""
 
 #. description
 #: ../jobs/firewire.txt.in:3
 msgid ""
-"Firewire HDD verification procedure:\n"
-" 1.- Plug a Firewire HDD into the computer.\n"
-" 2.- A window should be opened asking which action should be performed (open "
-"folder, photo manager, etc).\n"
-" 3.- Copy some files from your internal HDD to the firewire HDD.\n"
-" 4.- Copy some files from the firewire HDD to your internal HDD."
-msgstr ""
-
-#. description
-#: ../jobs/firewire.txt.in:3 ../jobs/usb.txt.in:71
-msgid "Do the copy operations work as expected?"
+"PURPOSE:\n"
+"    This test will check that the firewire port works\n"
+"STEPS:\n"
+"    1. Plug a Firewire HDD into the computer\n"
+"    2. Either a window asking which action should be performed (open folder, "
+"photo manager, etc) or a file browser will open.\n"
+"    3. Copy some files from your internal HDD to the firewire HDD\n"
+"    4. Copy some files from the firewire HDD to your internal HDD\n"
+"VERIFICATION:\n"
+"    Do the copy operations work as expected?"
 msgstr ""
 
 #. description
@@ -512,345 +492,391 @@
 msgstr ""
 
 #. description
-#: ../jobs/gcalctool.txt.in:5
-msgid "Click the \"Test\" button to open the calculator."
-msgstr ""
-
-#. description
-#: ../jobs/gcalctool.txt.in:5
-msgid "Did it launch correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/gcalctool.txt.in:15
-msgid ""
-"1. Simple math functions (+,-,/,*) 2. Nested math functions ((,)) 3. "
-"Fractional math 4. Decimal math"
-msgstr ""
-
-#. description
-#: ../jobs/gcalctool.txt.in:30
-msgid "1. Memory set 2. Memory reset 3. Memory last clear 4. Memory clear"
-msgstr ""
-
-#. description
-#: ../jobs/gcalctool.txt.in:45
-msgid "Click the \"Test\" button to open the calculator and perform:"
-msgstr ""
-
-#. description
-#: ../jobs/gcalctool.txt.in:45
-msgid "1. Cut 2. Copy 3. Paste"
-msgstr ""
-
-#. description
-#: ../jobs/gcalctool.txt.in:45
-msgid "Did the functions perform as expected?"
-msgstr ""
-
-#. description
-#: ../jobs/gedit.txt.in:5
-msgid "Click the \"Test\" button to open gedit."
-msgstr ""
-
-#. description
-#: ../jobs/gedit.txt.in:5
-msgid ""
-"Enter some text and save the file (make a note of the file name you use), "
-"then close gedit."
-msgstr ""
-
-#. description
-#: ../jobs/gedit.txt.in:17
-msgid ""
-"Click the \"Test\" button to open gedit, and re-open the file you created "
-"previously."
-msgstr ""
-
-#. description
-#: ../jobs/gedit.txt.in:17
-msgid "Edit then save the file, then close gedit."
-msgstr ""
-
-#. description
-#: ../jobs/gedit.txt.in:17 ../jobs/gnome-terminal.txt.in:5
-msgid "Did this perform as expected?"
-msgstr ""
-
-#. description
-#: ../jobs/gnome-terminal.txt.in:5
-msgid "Click the \"Test\" button to open Terminal."
-msgstr ""
-
-#. description
-#: ../jobs/gnome-terminal.txt.in:5
-msgid ""
-"Type 'ls' and press enter. You should see a list of files and folder in your "
-"home directory."
-msgstr ""
-
-#. description
-#: ../jobs/gnome-terminal.txt.in:5
-msgid "Close the terminal window."
-msgstr ""
-
-#. description
 #: ../jobs/graphics.txt.in:5
-msgid ""
-"2d graphics appears to be working, your running X.Org version is: $output"
+msgid "Test to output the Xorg version"
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:23
+#: ../jobs/graphics.txt.in:12
 msgid "Run gtkperf to make sure that GTK based test cases work"
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:23
-msgid ""
-"In the future add the returned time as a benchmark result to the checkbox "
-"report"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:31
-msgid ""
-"Display resolution change procedure: 1.- Open System->Preferences->Monitors "
-"2.- Select a new resolution from the dropdown list 3.- Click on Apply 4.- "
-"The resolution should change 5.- Select the original resolution from the "
-"dropdown list 6.- Click on Apply 7.- The resolution should change again"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:31
-msgid "Did the resolution change as expected?"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:46
-msgid ""
-"Display rotation verification procedure: 1.- Open System->Preferences-"
-">Monitors 2.- Select a new rotation value from the dropdown list 3.- Click "
-"on Apply 4.- The display should be rotated according to the new "
-"configuration value 5.- Click on Restore Previous Configuration 6.- The "
-"display configuration change should be reverted 7.- Repeat 2-6 for different "
-"rotation values"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:46
-msgid "Did the display rotation change as expected?"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:62 ../jobs/sru_suite.txt.in:151
+#: ../jobs/graphics.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"    This test will verify that the GUI is usable after manually changing "
+"resolution\n"
+"STEPS:\n"
+"    1. Open the Displays application\n"
+"    2. Select a new resolution from the dropdown list\n"
+"    3. Click on Apply\n"
+"    4. Select the original resolution from the dropdown list\n"
+"    5. Click on Apply\n"
+"VERIFICATION:\n"
+"    Did the resolution change as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will test display rotation\n"
+"STEPS:\n"
+"    1. Open the Displays application\n"
+"    2. Select a new rotation value from the dropdown list\n"
+"    3. Click on Apply\n"
+"    4. Click on Restore Previous Configuration\n"
+"    5. Click on Apply\n"
+"    6. Repeat 2-5 for different rotation values\n"
+"VERIFICATION:\n"
+"    Did the display rotation change as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:50
 msgid "Test that the X process is running."
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:68 ../jobs/sru_suite.txt.in:157
+#: ../jobs/graphics.txt.in:56
 msgid "Test that the X is not running in failsafe mode."
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:75
-msgid "Test that X does not leak memory when running programs."
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:82
-msgid "This display is using the following resolution:"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:82
-msgid "Is this acceptable for your display?"
+#: ../jobs/graphics.txt.in:63
+msgid ""
+"Test that X does not leak memory when running programs on systems with intel "
+"based graphics."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will verify the default display resolution\n"
+"STEPS:\n"
+"    1. This display is using the following resolution:\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Is this acceptable for your display?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:85
+msgid ""
+"Ensure the current resolution meets or exceeds the recommended minimum "
+"resolution (800x600). See here for details:"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:85
+msgid "https://help.ubuntu.com/community/Installation/SystemRequirements"
 msgstr ""
 
 #. description
 #: ../jobs/graphics.txt.in:95
 msgid ""
-"Ensure the current resolution meets or exceeds the recommended minimum "
-"resolution (1024 x 768). See here for details:"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:107
-msgid ""
-"Ensure the current resolution meets or exceeds the recommended minimum "
-"resolution (1024 x 600). See here for details:"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:107
-msgid "https://help.ubuntu.com/community/Installation/SystemRequirements"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:117
-msgid "Select Test to display a video test."
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:117
-msgid "Do you see color bars and static?"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:126
-msgid ""
-"The following screens and video modes have been detected on your system:"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:138
-msgid ""
-"Select Test to cycle through the detected video modes for your system."
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:138
-msgid "Did the screen appear to be working for each mode?"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:146
+"PURPOSE:\n"
+"    This test will test the default display\n"
+"STEPS:\n"
+"    1. Click \"Test\" to display a video test.\n"
+"VERIFICATION:\n"
+"    Do you see color bars and static?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:107
+msgid ""
+"PURPOSE:\n"
+"    This test checks the detected video modes\n"
+"STEPS:\n"
+"    1. The following screens and video modes have been detected on your "
+"system\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Are those correct?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:122
+msgid ""
+"PURPOSE:\n"
+"    This test cycles through the detected video modes\n"
+"STEPS:\n"
+"    1. Click \"Test\" to start cycling through the video modes\n"
+"VERIFICATION:\n"
+"    Did the screen appear to be working for each mode?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:133
 msgid "Check that the hardware is able to run compiz."
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:153
-msgid ""
-"Select Test to execute glxgears to ensure that minimal 3d graphics support "
-"is in place."
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:153
-msgid "Did the 3d animation appear?"
-msgstr ""
-
-#. description
-#: ../jobs/info.txt.in:60 ../jobs/screenshot.txt.in:7
+#: ../jobs/graphics.txt.in:140
+msgid ""
+"PURPOSE:\n"
+"    This test tests the basic 3D capabilities of your video card\n"
+"STEPS:\n"
+"    1. Click \"Test\" to execute an OpenGL demo. Press ESC at any time to "
+"close.\n"
+"    2. Verify that the animation is not jerky or slow.\n"
+"VERIFICATION:\n"
+"    1. Did the 3d animation appear?\n"
+"    2. Was the animation free from slowness/jerkiness?"
+msgstr ""
+
+#. description
+#: ../jobs/hibernate.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"    This test will check to make sure your system can successfully hibernate "
+"(if supported)\n"
+"STEPS:\n"
+"    1. Click on Test\n"
+"    2. The system will hibernate and should wake itself within 5 minutes\n"
+"    3. If your system does not wake itself after 5 minutes, please press the "
+"power button to wake the system manually\n"
+"    4. If the system fails to resume from hibernate, please restart System "
+"Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully hibernate and did it work properly after "
+"waking up?"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:5
+msgid "Attaches a report of installed codecs for Intel HDA"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:10
+msgid "Attaches a report of CPU information"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:15
+msgid "Attaches a copy of /var/log/dmesg to the test results"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:20
+msgid "Attaches info on DMI"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:26
+msgid "Attaches dmidecode output"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:31
+msgid "Attaches very verbose lspci output."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:40
+msgid "Attaches the contents of the various modprobe conf files."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:45
+msgid "Attaches the contents of the /etc/modules file."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:50
+msgid "attaches the contents of various sysctl config files."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:54
+msgid "Attaches a report of sysfs attributes."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:65
+msgid ""
+"Attaches a dump of the udev database showing system hardware information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:72
+msgid "Attaches a tarball of gcov data if present."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:77
+msgid "Attaches a list of the currently running kernel modules."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:85
 msgid "Captures a screenshot."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:71 ../jobs/sru_suite.txt.in:167
-msgid "Gather log from the firmware test suite run"
-msgstr ""
-
-#. description
-#: ../jobs/info.txt.in:82
+#: ../jobs/info.txt.in:91
+msgid "Attaches the screenshot captured in info/screenshot."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:96
+msgid "Gather log from the Firmware Test Suite run."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:103
+msgid "Attaches the contents of /proc/acpi/sleep if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:107
 msgid "Bootchart information."
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:4
-msgid "Moving the mouse should move the cursor on the screen."
-msgstr ""
-
-#. description
-#: ../jobs/input.txt.in:4
-msgid "Is your mouse working properly?"
-msgstr ""
-
-#. description
-#: ../jobs/input.txt.in:13
-msgid "Select Test to open a text area where to type keys on your keyboard."
-msgstr ""
-
-#. description
-#: ../jobs/input.txt.in:13
-msgid "Is your keyboard working properly?"
+#: ../jobs/info.txt.in:116
+msgid "SATA/IDE device information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:133
+msgid "Attaches the bootchart png file for bootchart runs"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:142
+msgid "Attaches the bootchart log for bootchart test runs."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:150
+msgid "installs the installer bootchart tarball if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:155
+msgid "Attaches the installer debug log if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/input.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will test your pointing device\n"
+"STEPS:\n"
+"    1. Move the cursor using the pointing device or touch the screen.\n"
+"    2. Perform some single/double/right click operations.\n"
+"VERIFICATION:\n"
+"    Did the pointing device work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/input.txt.in:17
+msgid ""
+"PURPOSE:\n"
+"    This test will test your keyboard\n"
+"STEPS:\n"
+"    1. Click on Test\n"
+"    2. On the open text area, use your keyboard to type something\n"
+"VERIFICATION:\n"
+"    Is your keyboard working properly?"
 msgstr ""
 
 #. description
 #: ../jobs/install.txt.in:6
 msgid ""
 "Tests to see that apt can access repositories and get updates (does not "
-"install updates)"
+"install updates). This is done to confirm that you could recover from an "
+"incomplete or broken update."
 msgstr ""
 
 #. description
 #: ../jobs/keys.txt.in:4
 msgid ""
-"Press the brightness buttons on the keyboard. A status window should \\ "
-"appear and the brightness should change."
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:12
-msgid ""
-"Press the volume buttons on the keyboard. A status window should \\ appear "
-"and the volume should change."
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:12
-msgid "Do the buttons work?"
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:21
-msgid ""
-"Press the mute key on the keyboard. A status window should appear \\ and the "
-"volume should mute/unmute when pressed multiple times."
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:30
-msgid ""
-"Press the sleep key on the keyboard. The computer should suspend and, \\ "
-"after pressing the power button, resume successfully."
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:39
-msgid ""
-"Press the battery information key on the keyboard. A status window \\ should "
-"appear and the amount of battery remaining should be displayed."
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:48
-msgid ""
-"Press the wireless networking key on the keyboard. The bluetooth icon \\ and "
-"the network connnection should go down if connected through the \\ wifi "
-"interface."
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:48
-msgid ""
-"Press the same key again and check that bluetooth icon is again \\ displayed "
-"and that the network connection is re-established \\ automatically."
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:48
-msgid "Does the key work?"
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:62
-msgid ""
-"The keyboard may have dedicated keys for controlling media as follows:"
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:62
-msgid "* Play/Pause * Stop * Forward * Backward (Rewind)"
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:62
-msgid "Play a media file and press each key in turn."
-msgstr ""
-
-#. description
-#: ../jobs/keys.txt.in:62
-msgid "Do the keys work as expected?"
+"PURPOSE:\n"
+"    This test will test the brightness key\n"
+"STEPS:\n"
+"    1. Press the brightness buttons on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the brightness change following to your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:14
+msgid ""
+"PURPOSE:\n"
+"    This test will test the volume keys\n"
+"STEPS:\n"
+"    1. Press the volume buttons on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the volume change following to your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:25
+msgid ""
+"PURPOSE:\n"
+"    This test will test the mute key\n"
+"STEPS:\n"
+"    1. Press the mute button on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the volume mute following your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:37
+msgid ""
+"PURPOSE:\n"
+"    This test will test the sleep key\n"
+"STEPS:\n"
+"    1. Press the sleep key on the keyboard\n"
+"    2. Wake your system up by pressing the power button\n"
+"VERIFICATION:\n"
+"    Did the system go to sleep after pressing the sleep key?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will test the battery information key\n"
+"STEPS:\n"
+"    1. Press the battery information key on the keyboard\n"
+"VERIFICATION:\n"
+"    Did a notification appear showing the battery status?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:60
+msgid ""
+"PURPOSE:\n"
+"    This test will test the wireless key\n"
+"STEPS:\n"
+"    1. Press the wireless key on the keyboard\n"
+"    2. Press the same key again\n"
+"VERIFICATION:\n"
+"    Did the wireless go off on the first press and on again on the second?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:76
+msgid ""
+"PURPOSE:\n"
+"    This test will test the media keys of your keyboard\n"
+"STEPS:\n"
+"    1. Click test to launch the media player\n"
+"    2. Press the play/pause key on the keyboard\n"
+"    3. Press the forward key on the keyboard\n"
+"    4. Press the backward key on the keyboard\n"
+"    5. Press stop key on the keyboard\n"
+"VERIFICATION:\n"
+"    Do the keys work as expected?"
 msgstr ""
 
 #. description
@@ -860,1041 +886,1140 @@
 
 #. description
 #: ../jobs/local.txt.in:8
+msgid "Autotest Suite tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:13
 msgid "Bluetooth tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:13
+#: ../jobs/local.txt.in:18
 msgid "Camera tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:18
+#: ../jobs/local.txt.in:23
 msgid "Codec tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:23
+#: ../jobs/local.txt.in:28
 msgid "CPU tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:28
+#: ../jobs/local.txt.in:33
 msgid "System Daemon tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:33
+#: ../jobs/local.txt.in:38
 msgid "Disk tests"
 msgstr "Uji Disk"
 
 #. description
-#: ../jobs/local.txt.in:38
+#: ../jobs/local.txt.in:43
 msgid "Fingerprint reader tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:43
+#: ../jobs/local.txt.in:48
 msgid "Firewire disk tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:48
+#: ../jobs/local.txt.in:53
 msgid "Floppy disk tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:53
+#: ../jobs/local.txt.in:58
 msgid "Graphics tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:58
+#: ../jobs/local.txt.in:63
+msgid "Hibernation tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:68
 msgid "Informational tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:63
+#: ../jobs/local.txt.in:73
 msgid "Input Devices tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:68
+#: ../jobs/local.txt.in:78
 msgid "Software Installation tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:73
+#: ../jobs/local.txt.in:83
 msgid "Hotkey tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:78
+#: ../jobs/local.txt.in:88
+msgid "Linux Test Project tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:93
+msgid "Mago Automated Desktop Testing"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:98
 msgid "Media Card tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:83
+#: ../jobs/local.txt.in:103
+msgid "Memory tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:108
 msgid "Miscellaneous tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:88
+#: ../jobs/local.txt.in:113
 msgid "Monitor tests"
 msgstr "Uji Monitor"
 
 #. description
-#: ../jobs/local.txt.in:93
+#: ../jobs/local.txt.in:118
 msgid "Networking tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:98
+#: ../jobs/local.txt.in:123
+msgid "Optical Drive tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:128
+msgid "Panel Clock Verification tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:133
 msgid "PCMCIA/PCIX Card tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:103
+#: ../jobs/local.txt.in:138
 msgid "Peripheral tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:108
+#: ../jobs/local.txt.in:143
+msgid "Phoronix Test Suite tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:148
 msgid "Power Management tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:113
+#: ../jobs/local.txt.in:153
+msgid "QA Regression tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:158
+msgid "Server Services checks"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:163
+msgid "Suspend tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:168
 msgid "Unity tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:118
+#: ../jobs/local.txt.in:173
+msgid "USB tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:178
 msgid "User Applications"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:123
+#: ../jobs/local.txt.in:183
+msgid "Wireless networking tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:188
 msgid "Stress tests"
 msgstr ""
 
 #. description
 #: ../jobs/ltp.txt.in:3
-msgid "Linux Test Project"
-msgstr "Proyek Uji Linux"
+msgid ""
+"This test installs and runs Linux Test Project syscalls test. This can be "
+"destructive, thus this test is blacklisted by default."
+msgstr ""
 
 #. description
-#: ../jobs/mago.txt.in:3
-msgid "Automated desktop testing"
+#: ../jobs/mago.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"   This test installs and runs the Mago Automated Desktop Testing suite."
 msgstr ""
 
 #. description
 #: ../jobs/mediacard.txt.in:3
 msgid ""
-"Secure Digital (SD) media card support verification:\n"
-" 1.- Plug a SD media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:15
-msgid ""
-"Secure Digital (SD) media card support re-verification:\n"
-" 1.- Plug a SD media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:26
-msgid ""
-"Secure Digital High Capacity (SDHC) media card support verification:\n"
-" 1.- Plug a SDHC media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:38
-msgid ""
-"Secure Digital High Capacity (SDHC) media card support re-verification:\n"
-" 1.- Plug a SDHC media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:49
-msgid ""
-"Multi Media Card (MMC) media card support verification:\n"
-" 1.- Plug a MMC media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:61
-msgid ""
-"Multi Media Card (MMC) media card support re-verification:\n"
-" 1.- Plug a MMC media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:72
-msgid ""
-"Memory Stick (MS) media card support verification:\n"
-" 1.- Plug a MS media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:84
-msgid ""
-"Memory Stick (MS) media card support re-verification:\n"
-" 1.- Plug a MS media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:95
-msgid ""
-"Memory Stick Pro (MSP) media card support verification:\n"
-" 1.- Plug a MSP media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:107
-msgid ""
-"Memory Stick Pro (MSP) media card support re-verification:\n"
-" 1.- Plug a MSP media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:118
-msgid ""
-"Compact Flash (CF) media card support verification:\n"
-" 1.- Plug a CF media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:130
-msgid ""
-"Compact Flash (CF) media card support re-verification:\n"
-" 1.- Plug a CF media card into the computer.\n"
-" 2.- An icon should appear on the desktop and in the \"Places\" menu at the "
-"top of the screen.\n"
-" 3.- Right click on the deskop icon and select \"Safely Remove Drive\".\n"
-" 4.- The icon should disappear of both the deskop and the \"Places\" menu."
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:130
-msgid "Does the icon automatically appear/disappear?"
+"PURPOSE:\n"
+"    This test will check your system Secure Digital (SD) media card support\n"
+"STEPS:\n"
+"    1. Plug a SD media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:17
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Secure Digital (SD) media card support "
+"after suspend\n"
+"STEPS:\n"
+"    1. Plug a SD media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:30
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Secure Digital High Capacity (SDHC) "
+"media card support\n"
+"STEPS:\n"
+"    1. Plug a SDHC media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:44
+msgid ""
+"    This test will check your system Secure Digital High Capacity (SDHC) "
+"media card support after suspend\n"
+"STEPS:\n"
+"    1. Plug a SDHC media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:56
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Multi Media Card (MMC) media card "
+"support\n"
+"STEPS:\n"
+"    1. Plug a MMC media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Multi Media Card (MMC) media card "
+"support after suspend\n"
+"STEPS:\n"
+"    1. Plug a MMC media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:83
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Memory Stick (MS) media card support\n"
+"STEPS:\n"
+"    1. Plug a MS media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:97
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Memory Stick (MS) media card support "
+"after suspend\n"
+"STEPS:\n"
+"    1. Plug a MS media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:110
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Memory Stick Pro (MSP) media card "
+"support\n"
+"STEPS:\n"
+"    1. Plug a MSP media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:124
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Memory Stick Pro (MSP) media card "
+"support after suspend\n"
+"STEPS:\n"
+"    1. Plug a MSP media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:137
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system Compact Flash (CF) media card support\n"
+"STEPS:\n"
+"    1. Plug a CF media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:151
+msgid ""
+"    This test will check your system Compact Flash (CF) media card support "
+"after suspend\n"
+"STEPS:\n"
+"    1. Plug a CF media card into the computer\n"
+"    2. An icon should appear on the Launcher\n"
+"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
+"    4. The icon should disappear from the Launcher\n"
+"VERIFICATION:\n"
+"    Does the icon automatically appear/disappear?"
 msgstr ""
 
 #. description
 #: ../jobs/memory.txt.in:4
-msgid "The following amount of memory was detected:"
+msgid ""
+"PURPOSE:\n"
+"    This test checks the amount of memory that is detected\n"
+"STEPS:\n"
+"    1. Click Test to see the amount of detected memory\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Is the amount of detected memory correct?"
 msgstr ""
 
 #. description
-#: ../jobs/memory.txt.in:16
+#: ../jobs/memory.txt.in:19
 msgid "Test and exercise memory."
 msgstr ""
 
 #. description
 #: ../jobs/miscellanea.txt.in:8
 msgid ""
-"Select Test to switch to another virtual terminal and then back to X.  Your "
-"screen will change temporarily to a text console and then switch back to "
-"your current session."
-msgstr ""
-
-#. description
-#: ../jobs/miscellanea.txt.in:8
-msgid "Note that this test may require you to enter your password."
-msgstr ""
-
-#. description
-#: ../jobs/miscellanea.txt.in:8
-msgid "Did the screen change temporarily to a text console?"
-msgstr ""
-
-#. description
-#: ../jobs/miscellanea.txt.in:20
-msgid "Run Colin King's Firmware Test Suite automated tests."
-msgstr ""
-
-#. description
-#: ../jobs/miscellanea.txt.in:29
+"PURPOSE:\n"
+"    This test will check that the system can switch to a virtual terminal "
+"and back to X\n"
+"STEPS:\n"
+"    1. Click \"Test\" to switch to another virtual terminal and then back to "
+"X\n"
+"VERIFICATION:\n"
+"    Did your screen change temporarily to a text console and then switch "
+"back to your current session?"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:21
+msgid "Run Firmware Test Suite (fwts) automated tests."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:30
 msgid ""
 "ipmitool is required for ipmi testing. This checks for ipmitool and installs "
 "it if not available."
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:36
+#: ../jobs/miscellanea.txt.in:37
 msgid ""
 "This will run some basic connectivity tests against a BMC, verifying that "
 "IPMI works."
 msgstr ""
 
 #. description
-#: ../jobs/monitor.txt.in:3
-msgid "If your system does not have a VGA port, please skip this test."
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:3
-msgid ""
-"Connect a display (if not already connected) to the VGA port on your system. "
-"Is the image displayed correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:10
-msgid "If your system does not have a DVI port, please skip this test."
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:10
-msgid ""
-"Connect a display (if not already connected) to the DVI port on your system. "
-"Is the image displayed correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:17
-msgid "If your system does not have DisplayPort, please skip this test."
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:17
-msgid ""
-"Connect a display (if not already connected) to the DisplayPort on your "
-"system. Is the image displayed correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:24
-msgid "If your system does not have a HDMI port, please skip this test."
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:24
-msgid ""
-"Connect a display (if not already connected) to the HDMI port on your "
-"system. Is the image displayed correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:31
-msgid "If your system does not have a S-VIDEO port, please skip this test."
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:31
-msgid ""
-"Connect a display (if not already connected) to the S-VIDEO port on your "
-"system. Is the image displayed correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:38
-msgid "If your system does not have a RCA port, please skip this test."
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:38
-msgid ""
-"Connect a display (if not already connected) to the RCA port on your system. "
-"Is the image displayed correctly?"
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:46
-msgid ""
-"Monitor power saving verification procedure:\n"
-" 1.- Select Test to try the power saving capabilities of your monitor.\n"
-" 2.- The monitor should go blank.\n"
-" 3.- Press any key or move the mouse to recover."
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:46
-msgid "Did the monitor go blank?"
+#: ../jobs/miscellanea.txt.in:43
+msgid ""
+"   Determine if we need to run tests specific to portable computers that may "
+"not apply to desktops."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:51
+msgid ""
+"This test checks /var/crash to see if there are any crash reports present."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:51
+msgid "If there are, this test will fail."
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"    This test will check your VGA port. Skip if your system does not have a "
+"VGA port.\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the VGA port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:13
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVI port. Skip if your system does not have a "
+"DVI port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the DVI port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:23
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DisplayPort port. Skip if your system does not "
+"have a DisplayPort port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the DisplayPort port "
+"on your system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check your HDMI port. Skip if your system does not have a "
+"HDMI port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the HDMI port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:43
+msgid ""
+"PURPOSE:\n"
+"    This test will check your S-VIDEO port. Skip if your system does not "
+"have a S-VIDEO port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the S-VIDEO port on "
+"your system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:53
+msgid ""
+"PURPOSE:\n"
+"    This test will check your RCA port. Skip if your system does not have a "
+"RCA port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the RCA port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:64
+msgid ""
+"PURPOSE:\n"
+"    This test will check your monitor power saving capabilities\n"
+"STEPS:\n"
+"    1. Click \"Test\" to try the power saving capabilities of your monitor\n"
+"    2. Press any key or move the mouse to recover\n"
+"VERIFICATION:\n"
+"    Did the the monitor go blank and turn on again?"
 msgstr ""
 
 #. description
 #: ../jobs/networking.txt.in:5
-msgid "Detecting your network controller(s):"
+msgid "Test to detect the available network controllers"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:11
+msgid "Tests whether the system has a working Internet connection."
 msgstr ""
 
 #. description
 #: ../jobs/networking.txt.in:16
-msgid "Testing your connection to the Internet:"
-msgstr ""
-
-#. description
-#: ../jobs/networking.txt.in:26
 msgid "Network Information"
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:46
-msgid "Wireless scanning test."
-msgstr ""
-
-#. description
-#: ../jobs/networking.txt.in:52
-msgid ""
-"Wireless network connection procedure: 1.- Click on the Network Manager "
-"applet 2.- Select a network below the 'Wireless networks' section 3.- Notify "
-"OSD should confirm that the connection has been established 4.- Select Test "
-"to verify that it's possible to establish an HTTP connection"
-msgstr ""
-
-#. description
-#: ../jobs/networking.txt.in:64
-msgid ""
-"Wired network connection procedure: 1.- Click on the Network Manager applet "
-"2.- Select a network below the 'Wired network' section 3.- Notify OSD should "
-"confirm that the connection has been established 4.- Select Test to verify "
-"that it's possible to establish an HTTP connection"
-msgstr ""
-
-#. description
-#: ../jobs/networking.txt.in:76
-msgid ""
-"Built-in modem network connection procedure: 1.- Connect the telephone line "
-"to the computer 2.- Right click on the Network Manager applet 3.- Select "
-"'Edit Connections' 4.- Select the 'DSL' tab 5.- Click on add 'Add' button 6.-"
-" Configure the connection parameters properly 7.- Notify OSD should confirm "
-"that the connection has been established 8.- Select Test to verify that it's "
-"possible to establish an HTTP connection"
-msgstr ""
-
-#. description
-#: ../jobs/networking.txt.in:76 ../jobs/peripheral.txt.in:15
-msgid "Was the connection correctly established?"
-msgstr ""
-
-#. description