Merge lp:~roadmr/ubuntu/saucy/checkbox/0.16 into lp:ubuntu/saucy/checkbox

[Daniel Manrique]

New version of checkbox for Ubuntu, bringing it in sync with checkbox trunk.

[Daniel Manrique (roadmr)]

Self-approving.

review: Approve

=== modified file 'Vagrantfile'
--- Vagrantfile	2013-03-07 15:52:02 +0000
+++ Vagrantfile	2013-05-09 20:11:45 +0000
@@ -3,45 +3,54 @@
 
 Vagrant::Config.run do |config|
 
+  config.ssh.timeout = 60
+
+  # Define a Ubuntu Server image (cloud) for the 12.04 release (precise)
+  config.vm.define :precise do |precise_config|
+    precise_config.vm.box = "precise-cloud-i386"
+    precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
   # Define a Ubuntu Server image (cloud) for the 12.10 release (quantal)
   config.vm.define :quantal do |quantal_config|
     quantal_config.vm.box = "quantal-cloud-i386"
     quantal_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-i386-vagrant-disk1.box"
   end
 
-  # Define a Ubuntu Server image (cloud) for the 12.04 release (precise)
-  config.vm.define :precise do |precise_config|
-    precise_config.vm.box = "precise-cloud-i386"
-    precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
+  # Define a Ubuntu Server image (cloud) for the 13.04 release (raring)
+  config.vm.define :raring do |raring_config|
+    raring_config.vm.box = "raring-cloud-i386"
+    raring_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-i386-vagrant-disk1.box"
   end
 
   # For debugging and later future GUI testing
-  # config.vm.boot_mode = :gui
+  if ENV.key? "VAGRANT_GUI"
+    config.vm.boot_mode = :gui
+  end
+
+  # Setup an apt cache if one is available
+  if ENV.key? "VAGRANT_APT_CACHE"
+    config.vm.provision :shell, :inline => "echo 'Acquire::http { Proxy \"#{ENV['VAGRANT_APT_CACHE']}\"; };' > /etc/apt/apt.conf"
+  end
 
   # Update to have the latest packages, this is needed because the image comes
   # with an old (and no longer working) apt cache and links to many packages no
   # longer work.
-  config.vm.provision :shell, :inline => "apt-get update && apt-get dist-upgrade --yes"
+  config.vm.provision :shell, :inline => "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade --yes"
   # Install dependencies from native packages
-  config.vm.provision :shell, :inline => "apt-get install --yes python3-setuptools python3-lxml"
+  config.vm.provision :shell, :inline => "apt-get install --yes python3-setuptools python3-pkg-resources python3-lxml"
   # Install python3-mock so that we can create mock objects for testing
   config.vm.provision :shell, :inline => "apt-get install --yes python3-mock"
+  # Install python3-sphinx so that we can build documentation
+  config.vm.provision :shell, :inline => "apt-get install --yes python3-sphinx"
   # Install policykit-1 so that we have pkexec
   config.vm.provision :shell, :inline => "apt-get install --yes policykit-1"
   # Install some checkbox script dependencies:
   # Later on those could be installed on demand to test how we behave without
   # them but for now that's good enough. Little by little...
   config.vm.provision :shell, :inline => "apt-get install --yes fwts"
-  # Install python3-dev so that we can build native bits of other dependencies later
-  config.vm.provision :shell, :inline => "apt-get install --yes python3-dev"
-  # Install PIP so that we can install the rest from source
-  config.vm.provision :shell, :inline => "apt-get install --yes python-pip" 
-  # Update distribute as the version from ubuntu is too old to install coverage
-  config.vm.provision :shell, :inline => "pip install -U distribute"
-  # Install coverage
-  config.vm.provision :shell, :inline => "pip install -U coverage"
   # Develop plainbox so that we have it in $PATH
   config.vm.provision :shell, :inline => "cd /vagrant/plainbox/ && python3 setup.py develop"
   # Create a cool symlink so that everyone knows where to go to
-  config.vm.provision :shell, :inline => "ln -fs /vagrant /home/vagrant/checkbox"
+  config.vm.provision :shell, :inline => "ln --no-dereference --force --symbolic /vagrant /home/vagrant/checkbox"
 end
 
=== added file 'bin/checkbox-hw-collection'
--- bin/checkbox-hw-collection	1970-01-01 00:00:00 +0000
+++ bin/checkbox-hw-collection	2013-05-09 20:11:45 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+export CHECKBOX_DATA=${CHECKBOX_DATA:-~/.checkbox-hw-collection}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/hwsubmit.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+    old_data=$HOME/.checkbox-hw-collection
+    if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+    then
+        mv -f $old_data $CHECKBOX_DATA
+    fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== modified file 'checkbox/contrib/xrandr.py'
--- checkbox/contrib/xrandr.py	2012-09-03 13:51:52 +0000
+++ checkbox/contrib/xrandr.py	2013-05-09 20:11:45 +0000
@@ -32,9 +32,21 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301  USA
 
-from ctypes import *
+from ctypes import (
+    POINTER,
+    Structure,
+    byref,
+    c_char_p,
+    c_void_p,
+    c_int,
+    c_long,
+    c_ulong,
+    c_ushort,
+    cdll,
+)
 import os
 
 RR_ROTATE_0 = 1
@@ -90,10 +102,11 @@
 xlib = cdll.LoadLibrary('libX11.so.6')
 rr = cdll.LoadLibrary('libXrandr.so.2')
 
+
 # query resources
 class _XRRModeInfo(Structure):
     _fields_ = [
-        ("id", RRMode), # XID is c_long
+        ("id", RRMode),  # XID is c_long
         ("width", c_int),
         ("height", c_int),
         ("dotClock", c_long),
@@ -109,6 +122,7 @@
         ("modeFlags", c_long),
         ]
 
+
 class _XRRScreenSize(Structure):
     _fields_ = [
         ("width", c_int),
@@ -117,6 +131,7 @@
         ("mheight", c_int)
         ]
 
+
 class _XRRCrtcInfo(Structure):
     _fields_ = [
         ("timestamp", Time),
@@ -133,6 +148,7 @@
         ("possible", POINTER(RROutput)),
         ]
 
+
 class _XRRScreenResources(Structure):
     _fields_ = [
         ("timestamp", Time),
@@ -145,16 +161,19 @@
         ("modes", POINTER(_XRRModeInfo)),
         ]
 
+
 class RRError(Exception):
     """Base exception class of the module"""
     pass
 
+
 class UnsupportedRRError(RRError):
     """Raised if the required XRandR extension version is not available"""
     def __init__(self, required, current):
         self.required = required
         self.current = current
 
+
 # XRRGetOutputInfo
 class _XRROutputInfo(Structure):
     _fields_ = [
@@ -175,6 +194,7 @@
         ("modes", POINTER(RRMode))
         ]
 
+
 class _XRRCrtcGamma(Structure):
     _fields_ = [
         ('size', c_int),
@@ -183,13 +203,15 @@
         ('blue', POINTER(c_ushort)),
         ]
 
-def _array_conv(array, type, conv = lambda x:x):
+
+def _array_conv(array, type, conv=lambda x: x):
     length = len(array)
-    res = (type*length)()
+    res = (type * length)()
     for i in range(length):
         res[i] = conv(array[i])
     return res
 
+
 class Output:
     """The output is a reference to a supported output jacket of the graphics
        card. Outputs are attached to a hardware pipe to be used. Furthermore
@@ -220,16 +242,22 @@
         """Frees the internal reference to the output info if the output gets
            removed"""
         rr.XRRFreeOutputInfo(self._info)
+
     def get_physical_width(self):
         """Returns the display width reported by the connected output device"""
         return self._info.contents.mm_width
+
     def get_physical_height(self):
-        """Returns the display height reported by the connected output device"""
+        """
+        Returns the display height reported by the connected output device
+        """
         return self._info.contents.mm_height
+
     def get_crtc(self):
         """Returns the xid of the hardware pipe to which the output is
            attached. If the output is disabled it will return 0"""
         return self._info.contents.crtc
+
     def get_crtcs(self):
         """Returns the xids of the hardware pipes to which the output could
            be attached"""
@@ -290,7 +318,8 @@
 
     def disable(self):
         """Disables the output"""
-        if not self.is_active(): return
+        if not self.is_active():
+            return
         self._mode = None
         self._crtc._outputs.remove(self)
         self._crtc = None
@@ -342,9 +371,11 @@
         else:
             return self._changes != CHANGES_NONE
 
+
 class Crtc:
     """The crtc is a reference to a hardware pipe that is provided by the
        graphics device. Outputs can be attached to crtcs"""
+
     def __init__(self, info, xid, screen):
         """Initializes the hardware pipe object"""
         self._info = info
@@ -437,24 +468,34 @@
             return False
         if len(self._outputs):
             for other in self._outputs:
-                if other == output: continue
-                if other._x != output._x: return False
-                if other._y != output._y: return False
-                if other._mode != output._mode: return False
-                if other._rotation != output._rotation: return False
+                if other == output:
+                    continue
+                if other._x != output._x:
+                    return False
+                if other._y != output._y:
+                    return False
+                if other._mode != output._mode:
+                    return False
+                if other._rotation != output._rotation:
+                    return False
         #FIXME: pick_crtc is still missing
         elif self._info.contents.noutput > 0:
-            if self._info.contents.x != output._x: return False
-            if self._info.contents.y != output._y: return False
-            if self._info.contents.mode_info != output._mode: return False
-            if self._info.rotation != output._rotation: return False
+            if self._info.contents.x != output._x:
+                return False
+            if self._info.contents.y != output._y:
+                return False
+            if self._info.contents.mode_info != output._mode:
+                return False
+            if self._info.rotation != output._rotation:
+                return False
         return True
 
     def supports_rotation(self, rotation):
         """Check if the given rotation is supported by the crtc"""
         rotations = self._info.contents.rotations
-        dir = rotation & (RR_ROTATE_0|RR_ROTATE_90|RR_ROTATE_180|RR_ROTATE_270)
-        reflect = rotation & (RR_REFLECT_X|RR_REFLECT_Y)
+        dir = rotation & (RR_ROTATE_0 | RR_ROTATE_90 | RR_ROTATE_180 |
+                          RR_ROTATE_270)
+        reflect = rotation & (RR_REFLECT_X | RR_REFLECT_Y)
         if (((rotations & dir) != 0) and ((rotations & reflect) == reflect)):
             return True
         return False
@@ -467,10 +508,13 @@
         for i in range(self._info.contents.noutput):
             id = self._info.contents.outputs[i]
             output = self._screen.get_output_by_id(id)
-            if not output in self._outputs: return True
-            if output.has_changed(): return True
+            if not output in self._outputs:
+                return True
+            if output.has_changed():
+                return True
         return False
 
+
 class Screen:
     def __init__(self, dpy, screen=-1):
         """Initializes the screen"""
@@ -500,7 +544,7 @@
         self._load_config()
         (self._width, self._height,
          self._width_mm, self._height_mm) = self.get_size()
-        if XRANDR_VERSION >= (1,2):
+        if XRANDR_VERSION >= (1, 2):
             self._load_screen_size_range()
             self._load_crtcs()
             self._load_outputs()
@@ -596,7 +640,7 @@
 
     def get_current_rate(self):
         """Returns the currently used refresh rate"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         xccr = rr.XRRConfigCurrentRate
         xccr.restype = c_int
         return xccr(self._config)
@@ -605,7 +649,7 @@
         """Returns the refresh rates that are supported by the screen for
            the given resolution. See get_available_sizes for the resolution to
            which size_index points"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         rates = []
         nrates = c_int()
         rr.XRRConfigRates.restype = POINTER(c_ushort)
@@ -617,14 +661,14 @@
     def get_current_rotation(self):
         """Returns the currently used rotation. Can be RR_ROTATE_0,
         RR_ROTATE_90, RR_ROTATE_180 or RR_ROTATE_270"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         current = c_ushort()
-        rotations = rr.XRRConfigRotations(self._config, byref(current))
+        rr.XRRConfigRotations(self._config, byref(current))
         return current.value
 
     def get_available_rotations(self):
         """Returns a binary flag that holds the available resolutions"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         current = c_ushort()
         rotations = rr.XRRConfigRotations(self._config, byref(current))
         return rotations
@@ -632,7 +676,7 @@
     def get_current_size_index(self):
         """Returns the position of the currently used resolution size in the
            list of available resolutions. See get_available_sizes"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         rotation = c_ushort()
         size = rr.XRRConfigCurrentConfiguration(self._config,
                                                 byref(rotation))
@@ -641,7 +685,7 @@
     def get_available_sizes(self):
         """Returns the available resolution sizes of the screen. The size
            index points to the corresponding resolution of this list"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         sizes = []
         nsizes = c_int()
         xcs = rr.XRRConfigSizes
@@ -655,7 +699,7 @@
         """Configures the screen with the given resolution at the given size
            index, rotation and refresh rate. To get in effect call
            Screen.apply_config()"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         self.set_size_index(size_index)
         self.set_refresh_rate(rate)
         self.set_rotation(rotation)
@@ -710,7 +754,7 @@
 
     def print_info(self, verbose=False):
         """Prints some information about the detected screen and its outputs"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         print("Screen %s: minimum %s x %s, current %s x %s, maximum %s x %s" %\
               (self._screen,
                self._width_min, self._height_min,
@@ -728,20 +772,25 @@
         i = 0
         print("Sizes @ Refresh Rates:")
         for s in self.get_available_sizes():
-            print("  [%s] %s x %s @ %s" % (i, s.width, s.height,
-                                           self.get_available_rates_for_size_index(i)))
+            print("  [%s] %s x %s @ %s" % (
+                i, s.width, s.height,
+                self.get_available_rates_for_size_index(i)))
             i += 1
         print("Rotations:")
         rots = self.get_available_rotations()
-        if rots & RR_ROTATE_0: print("normal")
-        if rots & RR_ROTATE_90: print("right")
-        if rots & RR_ROTATE_180: print("inverted")
-        if rots & RR_ROTATE_270: print("left")
+        if rots & RR_ROTATE_0:
+            print("normal")
+        if rots & RR_ROTATE_90:
+            print("right")
+        if rots & RR_ROTATE_180:
+            print("inverted")
+        if rots & RR_ROTATE_270:
+            print("left")
         print("")
         print("Outputs:")
         for o in list(self.outputs.keys()):
             output = self.outputs[o]
-            print("  %s"  % o)
+            print("  %s" % o)
             if output.is_connected():
                 print("(%smm x %smm)" % (output.get_physical_width(),
                                          output.get_physical_height()))
@@ -761,40 +810,45 @@
                     print("")
                 print("    Rotations:")
                 rots = output.get_available_rotations()
-                if rots & RR_ROTATE_0: print("normal")
-                if rots & RR_ROTATE_90: print("right")
-                if rots & RR_ROTATE_180: print("inverted")
-                if rots & RR_ROTATE_270: print("left")
+                if rots & RR_ROTATE_0:
+                    print("normal")
+                if rots & RR_ROTATE_90:
+                    print("right")
+                if rots & RR_ROTATE_180:
+                    print("inverted")
+                if rots & RR_ROTATE_270:
+                    print("left")
                 print("")
             else:
                 print("(not connected)")
             if verbose:
                 print("    Core properties:")
-                for (f,t) in output._info.contents._fields_:
-                    print("      %s: %s" % (f,
-                                            getattr(output._info.contents, f)))
+                for (f, t) in output._info.contents._fields_:
+                    print("      %s: %s" % (
+                        f, getattr(output._info.contents, f)))
 
     def get_outputs(self):
         """Returns the outputs of the screen"""
-        _check_required_version((1,2))
+        _check_required_version((1, 2))
         return list(self.outputs.values())
 
     def get_output_names(self):
-        _check_required_version((1,2))
+        _check_required_version((1, 2))
         return list(self.outputs.keys())
 
     def set_size(self, width, height, width_mm, height_mm):
         """Apply the given pixel and physical size to the screen"""
-        _check_required_version((1,2))
+        _check_required_version((1, 2))
         # Check if we really need to apply the changes
-        if (width, height, width_mm, height_mm) == self.get_size(): return
+        if (width, height, width_mm, height_mm) == self.get_size():
+            return
         rr.XRRSetScreenSize(self._display, self._root,
                             c_int(width), c_int(height),
                             c_int(width_mm), c_int(height_mm))
 
     def apply_output_config(self):
         """Used for instantly applying RandR 1.2 changes"""
-        _check_required_version((1,2))
+        _check_required_version((1, 2))
         self._arrange_outputs()
         self._calculate_size()
         self.set_size(self._width, self._height,
@@ -802,7 +856,8 @@
 
         # Assign all active outputs to crtcs
         for output in list(self.outputs.values()):
-            if not output._mode or output._crtc: continue
+            if not output._mode or output._crtc:
+                continue
             for crtc in output.get_crtcs():
                 if crtc and crtc.supports_output(output):
                     crtc.add_output(output)
@@ -819,7 +874,7 @@
 
     def apply_config(self):
         """Used for instantly applying RandR 1.0 changes"""
-        _check_required_version((1,0))
+        _check_required_version((1, 0))
         status = rr.XRRSetScreenConfigAndRate(self._display,
                                               self._config,
                                               self._root,
@@ -834,7 +889,8 @@
         for output in self.get_outputs():
             # Skip not changed and not used outputs
             if not output.has_changed(CHANGES_RELATION) or \
-               output._mode == None: continue
+               output._mode == None:
+                continue
             relative = output._relative_to
             mode = self.get_mode_by_xid(output._mode)
             mode_relative = self.get_mode_by_xid(relative._mode)
@@ -867,11 +923,15 @@
         min_x = 32768
         min_y = 32768
         for output in self.get_outputs():
-            if output._mode == None: continue
-            if output._x < min_x: min_x = output._x
-            if output._y < min_y: min_y = output._y
+            if output._mode == None:
+                continue
+            if output._x < min_x:
+                min_x = output._x
+            if output._y < min_y:
+                min_y = output._y
         for output in self.get_outputs():
-            if output._mode == None: continue
+            if output._mode == None:
+                continue
             output._x -= min_x
             output._y -= min_y
             output._changes = output._changes | CHANGES_POSITION
@@ -882,14 +942,17 @@
         width = self._width
         height = self._height
         for output in self.get_outputs():
-            if not output._mode: continue
+            if not output._mode:
+                continue
             mode = self.get_mode_by_xid(output._mode)
             x = output._x
             y = output._y
             w = get_mode_width(mode, output._rotation)
             h = get_mode_height(mode, output._rotation)
-            if x + w > width: width = x + w
-            if y + h > height: height = y + h
+            if x + w > width:
+                width = x + w
+            if y + h > height:
+                height = y + h
         if width > self._width_max or height > self._height_max:
             raise RRError("The required size is not supported",
                           (width, height), (self._width_max, self._width_min))
@@ -904,6 +967,7 @@
                 self._width = width
         #FIXME: Physical size is missing
 
+
 def get_current_display():
     """Returns the currently used display"""
     display_url = os.getenv("DISPLAY")
@@ -918,16 +982,19 @@
     dpy = open_display(display_url.encode('utf-8'))
     return dpy
 
+
 def get_current_screen():
     """Returns the currently used screen"""
     screen = Screen(get_current_display())
     return screen
 
+
 def get_screen_of_display(display, count):
     """Returns the screen of the given display"""
     dpy = xlib.XOpenDisplay(display)
     return Screen(dpy, count)
 
+
 def get_version():
     """Returns a tuple containing the major and minor version of the xrandr
        extension or None if the extension is not available"""
@@ -939,12 +1006,14 @@
         return (major.value, minor.value)
     return None
 
+
 def has_extension():
     """Returns True if the xrandr extension is available"""
     if XRANDR_VERSION:
         return True
     return False
 
+
 def _to_gamma(gamma):
     g = rr.XRRAllocGamma(len(gamma[0]))
     for i in range(gamma[0]):
@@ -953,6 +1022,7 @@
         g.blue[i] = gamma[2][i]
     return g
 
+
 def _from_gamma(g):
     gamma = ([], [], [])
     for i in range(g.size):
@@ -961,12 +1031,14 @@
         gamma[2].append(g.blue[i])
     rr.XRRFreeGamma(g)
 
+
 def _check_required_version(version):
     """Raises an exception if the given or a later version of xrandr is not
        available"""
     if XRANDR_VERSION == None or XRANDR_VERSION < version:
         raise UnsupportedRRError(version, XRANDR_VERSION)
 
+
 def get_mode_height(mode, rotation):
     """Return the height of the given mode taking the rotation into account"""
     if rotation & (RR_ROTATE_0 | RR_ROTATE_180):
@@ -976,6 +1048,7 @@
     else:
         return 0
 
+
 def get_mode_width(mode, rotation):
     """Return the width of the given mode taking the rotation into account"""
     if rotation & (RR_ROTATE_0 | RR_ROTATE_180):
 
=== modified file 'checkbox/lib/fifo.py'
--- checkbox/lib/fifo.py	2012-06-09 15:50:39 +0000
+++ checkbox/lib/fifo.py	2013-05-09 20:11:45 +0000
@@ -18,6 +18,7 @@
 #
 import os
 import struct
+import logging
 
 from checkbox.contrib.bpickle import dumps, loads
 from checkbox.lib.selector import Selector, SelectorIO
@@ -36,7 +37,11 @@
         self.close()
 
     def close(self):
-        os.close(self.fileno)
+        try:
+            os.close(self.fileno)
+        except OSError as e:
+            logging.warning("Problem closing the fifo")
+            logging.warning(e)
 
     def wait_for(self, operation):
         if self._timeout is not None:
 
=== modified file 'checkbox/lib/template.py'
--- checkbox/lib/template.py	2012-10-16 21:42:45 +0000
+++ checkbox/lib/template.py	2013-05-09 20:11:45 +0000
@@ -65,8 +65,8 @@
     def dump_filename(self, elements, filename):
         logging.info("Dumping elements to filename: %s", filename)
 
-        file = open(filename, "w")
-        return self.dump_file(elements, file, filename)
+        with open(filename, "w") as stream:
+            return self.dump_file(elements, stream, filename)
 
     def load_file(self, file, filename="<stream>"):
         elements = []
@@ -139,5 +139,5 @@
     def load_filename(self, filename):
         logging.info("Loading elements from filename: %s", filename)
 
-        file = open(filename, "r", encoding="utf-8")
-        return self.load_file(file, filename)
+        with open(filename, "r", encoding="utf-8") as stream:
+            return self.load_file(stream, filename)
 
=== modified file 'checkbox/message.py'
--- checkbox/message.py	2012-06-01 21:34:18 +0000
+++ checkbox/message.py	2013-05-09 20:11:45 +0000
@@ -20,7 +20,6 @@
 import logging
 import itertools
 import posixpath
-import sys
 
 from checkbox.contrib import bpickle
 from checkbox.lib.safe import safe_close
@@ -41,11 +40,12 @@
 class MessageStore:
     """A message store which stores its messages in a file system hierarchy."""
 
-    #This caches everything but a message's data, making it manageable to keep in memory.
+    # This caches everything but a message's data, making it manageable to keep
+    # in memory.
     _message_cache = {}
 
-    #Setting this to False speeds things up considerably, at the expense 
-    #of a higher risk of data loss during a crash
+    # Setting this to False speeds things up considerably, at the expense of a
+    # higher risk of data loss during a crash
     safe_file_closing = True
 
     def __init__(self, persist, directory, directory_size=1000):
@@ -128,11 +128,12 @@
 
     def delete_old_messages(self):
         """Delete messages which are unlikely to be needed in the future."""
-        filenames = self._get_sorted_filenames()
-        for fn in itertools.islice(self._walk_messages(exclude=HELD+BROKEN),
-                                   self.get_pending_offset()):
-            os.unlink(fn)
-            containing_dir = posixpath.split(fn)[0]
+        filenames = itertools.islice(
+            self._walk_messages(exclude=HELD + BROKEN),
+            self.get_pending_offset())
+        for filename in filenames:
+            os.unlink(filename)
+            containing_dir = os.path.dirname(filename)
             if not os.listdir(containing_dir):
                 os.rmdir(containing_dir)
 
@@ -194,8 +195,9 @@
     def _walk_pending_messages(self):
         """Walk the files which are definitely pending."""
         pending_offset = self.get_pending_offset()
-        for i, filename in enumerate(self._walk_messages(exclude=HELD+BROKEN)):
-            if i >= pending_offset:
+        filenames = self._walk_messages(exclude=HELD + BROKEN)
+        for index, filename in enumerate(filenames):
+            if index >= pending_offset:
                 yield filename
 
     def _walk_messages(self, exclude=None):
@@ -235,12 +237,12 @@
         dirname, basename = posixpath.split(path)
         new_path = posixpath.join(dirname, basename.split("_")[0])
         if flags:
-            new_path += "_"+"".join(sorted(set(flags)))
+            new_path += "_" + "".join(sorted(set(flags)))
         os.rename(path, new_path)
         return new_path
 
     def _add_flags(self, path, flags):
-        self._set_flags(path, self._get_flags(path)+flags)
+        self._set_flags(path, self._get_flags(path) + flags)
 
     def _load_message(self, data):
         return bpickle.loads(data)
@@ -251,7 +253,7 @@
     def _read_message(self, filename, cache=False):
         #cache basically indicates whether the caller cares about having "data"
         if cache and filename in self._message_cache:
-            return Message(self._message_cache[filename],filename)
+            return Message(self._message_cache[filename], filename)
 
         data = self._get_content(filename)
         message = self._load_message(data)
@@ -271,7 +273,7 @@
 
         #Strip the big data element and shove it in the cache
 
-        temp_message=dict(message)
+        temp_message = dict(message)
         if "data" in temp_message:
             temp_message["data"] = None
 
 
=== modified file 'checkbox/parsers/submission.py'
--- checkbox/parsers/submission.py	2012-10-12 21:30:46 +0000
+++ checkbox/parsers/submission.py	2013-05-09 20:11:45 +0000
@@ -99,7 +99,7 @@
 
         context_parsers = {
             "/proc/cpuinfo": self.parseCpuinfo,
-            "/proc/meminfo": self.parseMeminfo,
+            "meminfo": self.parseMeminfo,
             "dmidecode": DmidecodeParser,
             "udevadm": self.parseUdevadm,
             "efi": EfiParser,
 
=== modified file 'checkbox/parsers/tests/fixtures/submission_info_memory.xml'
--- checkbox/parsers/tests/fixtures/submission_info_memory.xml	2012-10-12 21:19:04 +0000
+++ checkbox/parsers/tests/fixtures/submission_info_memory.xml	2013-05-09 20:11:45 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <system version="1.0">
 <context>
-<info command="cat /proc/meminfo">MemTotal:        1976036 kB
+<info command="meminfo_attachment">MemTotal:        1976036 kB
 MemFree:          590948 kB
 Buffers:          100976 kB
 Cached:           465660 kB
 
=== modified file 'checkbox/parsers/tests/test_cputable.py'
--- checkbox/parsers/tests/test_cputable.py	2012-10-09 13:32:06 +0000
+++ checkbox/parsers/tests/test_cputable.py	2013-05-09 20:11:45 +0000
@@ -60,7 +60,7 @@
 
     def test_empty(self):
         result = self.getResult("")
-        self.assertEquals(result.cpus, [])
+        self.assertEqual(result.cpus, [])
 
     def test_i386(self):
         result = self.getResult("""
@@ -68,7 +68,7 @@
 i386		i686		(i[3456]86|pentium)	32	little
 """)
         debian_cpu = result.getByDebianName("i386")
-        self.assertNotEquals(debian_cpu, None)
+        self.assertNotEqual(debian_cpu, None)
         gnu_cpu = result.getByGnuName("i686")
-        self.assertNotEquals(gnu_cpu, None)
-        self.assertEquals(debian_cpu, gnu_cpu)
+        self.assertNotEqual(gnu_cpu, None)
+        self.assertEqual(debian_cpu, gnu_cpu)
 
=== modified file 'checkbox/parsers/tests/test_description.py'
--- checkbox/parsers/tests/test_description.py	2012-10-09 13:32:06 +0000
+++ checkbox/parsers/tests/test_description.py	2013-05-09 20:11:45 +0000
@@ -46,22 +46,22 @@
 
     def test_one_line(self):
         line = PURPOSE_RE.sub(r"", "1. foo\n")
-        self.assertEquals(line, "foo\n")
+        self.assertEqual(line, "foo\n")
 
     def test_two_lines(self):
         line = PURPOSE_RE.sub(r"", "1. foo\n2. bar\n")
-        self.assertEquals(line, "foo\nbar\n")
+        self.assertEqual(line, "foo\nbar\n")
 
 
 class TestStepsRe(TestCase):
 
     def test_one_line(self):
         line = STEPS_RE.sub(r"\1.\2", "1: foo\n")
-        self.assertEquals(line, "1. foo\n")
+        self.assertEqual(line, "1. foo\n")
 
     def test_two_lines(self):
         line = STEPS_RE.sub(r"\1.\2", "1: foo\n2: bar\n")
-        self.assertEquals(line, "1. foo\n2. bar\n")
+        self.assertEqual(line, "1. foo\n2. bar\n")
 
 
 class TestDescriptionParser(TestCase):
@@ -78,14 +78,14 @@
 
     def assertResult(
         self, result, purpose=None, steps=None, verification=None, info=None):
-        self.assertEquals(result.purpose, purpose)
-        self.assertEquals(result.steps, steps)
-        self.assertEquals(result.verification, verification)
-        self.assertEquals(result.info, info)
+        self.assertEqual(result.purpose, purpose)
+        self.assertEqual(result.steps, steps)
+        self.assertEqual(result.verification, verification)
+        self.assertEqual(result.info, info)
 
     def test_empty(self):
         result = self.getResult("")
-        self.assertEquals(result.purpose, None)
+        self.assertEqual(result.purpose, None)
 
     def test_purpose(self):
         result = self.getResult("""
@@ -151,10 +151,10 @@
 VERIFICACIÓN:
      ¿Son las pantallas y los modos de vídeo correctos?
 """)
-        self.assertNotEquals(result.purpose, None)
-        self.assertNotEquals(result.steps, None)
-        self.assertNotEquals(result.verification, None)
-        self.assertEquals(result.info, "$output\n")
+        self.assertNotEqual(result.purpose, None)
+        self.assertNotEqual(result.steps, None)
+        self.assertNotEqual(result.verification, None)
+        self.assertEqual(result.info, "$output\n")
 
     def test_ru(self):
         result = self.getResult("""
@@ -166,10 +166,10 @@
 ПРОВЕРКА:
     Был ли слышен звук в наушниках и был ли он воспроизведён в ваших наушниках без искажений, щелчков или других искажённых звуков?"
 """)
-        self.assertNotEquals(result.purpose, None)
-        self.assertNotEquals(result.steps, None)
-        self.assertNotEquals(result.verification, None)
-        self.assertEquals(result.info, None)
+        self.assertNotEqual(result.purpose, None)
+        self.assertNotEqual(result.steps, None)
+        self.assertNotEqual(result.verification, None)
+        self.assertEqual(result.info, None)
 
     def test_substitute_purpose(self):
         result = self.getResult("""
 
=== modified file 'checkbox/parsers/tests/test_dmi.py'
--- checkbox/parsers/tests/test_dmi.py	2012-10-09 13:32:06 +0000
+++ checkbox/parsers/tests/test_dmi.py	2013-05-09 20:11:45 +0000
@@ -45,36 +45,36 @@
 
     def test_devices(self):
         result = self.getResult()
-        self.assertEquals(len(result.devices), 4)
+        self.assertEqual(len(result.devices), 4)
 
     def test_bios(self):
         result = self.getResult()
         device = result.getDevice("BIOS")
         self.assertTrue(device)
-        self.assertEquals(device.product, "BIOS PRODUCT")
-        self.assertEquals(device.vendor, "BIOS VENDOR")
-        self.assertEquals(device.serial, None)
+        self.assertEqual(device.product, "BIOS PRODUCT")
+        self.assertEqual(device.vendor, "BIOS VENDOR")
+        self.assertEqual(device.serial, None)
 
     def test_board(self):
         result = self.getResult()
         device = result.getDevice("BOARD")
         self.assertTrue(device)
-        self.assertEquals(device.product, None)
-        self.assertEquals(device.vendor, None)
-        self.assertEquals(device.serial, None)
+        self.assertEqual(device.product, None)
+        self.assertEqual(device.vendor, None)
+        self.assertEqual(device.serial, None)
 
     def test_chassis(self):
         result = self.getResult()
         device = result.getDevice("CHASSIS")
         self.assertTrue(device)
-        self.assertEquals(device.product, "Notebook")
-        self.assertEquals(device.vendor, "CHASSIS VENDOR")
-        self.assertEquals(device.serial, None)
+        self.assertEqual(device.product, "Notebook")
+        self.assertEqual(device.vendor, "CHASSIS VENDOR")
+        self.assertEqual(device.serial, None)
 
     def test_system(self):
         result = self.getResult()
         device = result.getDevice("SYSTEM")
         self.assertTrue(device)
-        self.assertEquals(device.product, "SYSTEM PRODUCT")
-        self.assertEquals(device.vendor, "SYSTEM VENDOR")
-        self.assertEquals(device.serial, "SYSTEM SERIAL")
+        self.assertEqual(device.product, "SYSTEM PRODUCT")
+        self.assertEqual(device.vendor, "SYSTEM VENDOR")
+        self.assertEqual(device.serial, "SYSTEM SERIAL")
 
=== modified file 'checkbox/parsers/tests/test_efi.py'
--- checkbox/parsers/tests/test_efi.py	2012-10-09 13:32:06 +0000
+++ checkbox/parsers/tests/test_efi.py	2013-05-09 20:11:45 +0000
@@ -46,18 +46,18 @@
 
     def test_empty(self):
         result = self.getResult("")
-        self.assertEquals(result.device, None)
+        self.assertEqual(result.device, None)
 
     def test_product(self):
         result = self.getResult("""
 Foo Bar
 """)
-        self.assertEquals(result.device.vendor, None)
-        self.assertEquals(result.device.product, "Foo Bar")
+        self.assertEqual(result.device.vendor, None)
+        self.assertEqual(result.device.product, "Foo Bar")
 
     def test_vendor_product(self):
         result = self.getResult("""
 Foo by Bar
 """)
-        self.assertEquals(result.device.vendor, "Foo")
-        self.assertEquals(result.device.product, "Bar")
+        self.assertEqual(result.device.vendor, "Foo")
+        self.assertEqual(result.device.product, "Bar")
 
=== modified file 'checkbox/parsers/tests/test_submission.py'
--- checkbox/parsers/tests/test_submission.py	2013-03-07 15:52:02 +0000
+++ checkbox/parsers/tests/test_submission.py	2013-05-09 20:11:45 +0000
@@ -18,7 +18,6 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
 import os
-import gzip
 
 from unittest import TestCase
 
@@ -64,28 +63,22 @@
 
 class TestSubmissionParser(TestCase):
 
-    def getFixture(self, name):
-        return os.path.join(os.path.dirname(__file__), "fixtures", name)
-
-    def getParser(self, name):
-        fixture = self.getFixture(name)
-        stream = open(fixture)
-        return SubmissionParser(stream)
-
     def getResult(self, name, project="test"):
         result = {}
-        parser = self.getParser(name)
-        parser.run(SubmissionRun, result=result, project=project)
+        fixture = os.path.join(os.path.dirname(__file__), "fixtures", name)
+        with open(fixture) as stream:
+            parser = SubmissionParser(stream)
+            parser.run(SubmissionRun, result=result, project=project)
         return result
 
     def test_distribution(self):
         """Distribution information is in the lsbrelease element."""
         result = self.getResult("submission_lsbrelease.xml")
         self.assertTrue("distribution" in result)
-        self.assertEquals(result["distribution"]["release"], "12.10")
-        self.assertEquals(result["distribution"]["codename"], "quantal")
-        self.assertEquals(result["distribution"]["distributor_id"], "Ubuntu")
-        self.assertEquals(
+        self.assertEqual(result["distribution"]["release"], "12.10")
+        self.assertEqual(result["distribution"]["codename"], "quantal")
+        self.assertEqual(result["distribution"]["distributor_id"], "Ubuntu")
+        self.assertEqual(
             result["distribution"]["description"],
             "Ubuntu quantal (development branch)")
 
@@ -93,45 +86,45 @@
         """Memory state is in an info element."""
         result = self.getResult("submission_info_memory.xml")
         self.assertTrue("memory_state" in result)
-        self.assertEquals(result["memory_state"]["total"], 2023460864)
-        self.assertEquals(result["memory_state"]["swap"], 2067787776)
+        self.assertEqual(result["memory_state"]["total"], 2023460864)
+        self.assertEqual(result["memory_state"]["swap"], 2067787776)
 
     def test_processor(self):
         """Processor information can be in a processors element."""
         result = self.getResult("submission_processors.xml")
         self.assertTrue("processor_state" in result)
-        self.assertEquals(result["processor_state"]["bogomips"], 1197)
-        self.assertEquals(result["processor_state"]["cache"], 1048576)
-        self.assertEquals(result["processor_state"]["count"], 1)
-        self.assertEquals(result["processor_state"]["make"], "GenuineIntel")
-        self.assertEquals(
+        self.assertEqual(result["processor_state"]["bogomips"], 1197)
+        self.assertEqual(result["processor_state"]["cache"], 1048576)
+        self.assertEqual(result["processor_state"]["count"], 1)
+        self.assertEqual(result["processor_state"]["make"], "GenuineIntel")
+        self.assertEqual(
             result["processor_state"]["model"],
             "Intel(R) Pentium(R) M processor 1100MHz")
-        self.assertEquals(result["processor_state"]["model_number"], "6")
-        self.assertEquals(result["processor_state"]["model_revision"], "5")
-        self.assertEquals(result["processor_state"]["model_version"], "9")
-        self.assertEquals(
+        self.assertEqual(result["processor_state"]["model_number"], "6")
+        self.assertEqual(result["processor_state"]["model_revision"], "5")
+        self.assertEqual(result["processor_state"]["model_version"], "9")
+        self.assertEqual(
             result["processor_state"]["other"],
             """fpu vme de pse tsc msr mce cx8 apic sep mtrr pge mca cmov """
             """pat clflush dts acpi mmx fxsr sse sse2 tm pbe up bts est tm2""")
-        self.assertEquals(result["processor_state"]["platform_name"], "i386")
-        self.assertEquals(result["processor_state"]["speed"], 597)
+        self.assertEqual(result["processor_state"]["platform_name"], "i386")
+        self.assertEqual(result["processor_state"]["speed"], 597)
 
     def test_processor_info(self):
         """Processor information can be in an info element."""
         result = self.getResult("submission_info_cpuinfo.xml")
         self.assertTrue("processor_state" in result)
-        self.assertEquals(result["processor_state"]["bogomips"], 4788)
-        self.assertEquals(result["processor_state"]["cache"], 3145728)
-        self.assertEquals(result["processor_state"]["count"], 1)
-        self.assertEquals(result["processor_state"]["make"], "GenuineIntel")
-        self.assertEquals(
+        self.assertEqual(result["processor_state"]["bogomips"], 4788)
+        self.assertEqual(result["processor_state"]["cache"], 3145728)
+        self.assertEqual(result["processor_state"]["count"], 1)
+        self.assertEqual(result["processor_state"]["make"], "GenuineIntel")
+        self.assertEqual(
             result["processor_state"]["model"],
             "Intel(R) Core(TM) i5 CPU       M 520  @ 2.40GHz")
-        self.assertEquals(result["processor_state"]["model_number"], "6")
-        self.assertEquals(result["processor_state"]["model_revision"], "2")
-        self.assertEquals(result["processor_state"]["model_version"], "37")
-        self.assertEquals(
+        self.assertEqual(result["processor_state"]["model_number"], "6")
+        self.assertEqual(result["processor_state"]["model_revision"], "2")
+        self.assertEqual(result["processor_state"]["model_version"], "37")
+        self.assertEqual(
             result["processor_state"]["other"],
             """fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca """
             """cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm """
@@ -140,51 +133,51 @@
             """dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm """
             """sse4_1 sse4_2 popcnt aes lahf_lm ida arat dtherm tpr_shadow """
             """vnmi flexpriority ept vpid""")
-        self.assertEquals(result["processor_state"]["platform_name"], "x86_64")
-        self.assertEquals(result["processor_state"]["speed"], 1865)
+        self.assertEqual(result["processor_state"]["platform_name"], "x86_64")
+        self.assertEqual(result["processor_state"]["speed"], 1865)
 
     def test_attachments(self):
         """Attachments are in info elements."""
         result = self.getResult("submission_attachment.xml")
         self.assertTrue("attachments" in result)
-        self.assertEquals(len(result["attachments"]), 1)
+        self.assertEqual(len(result["attachments"]), 1)
 
     def test_device_udev(self):
         """Device states can be in the udev element."""
         result = self.getResult("submission_udev.xml")
         self.assertTrue("device_states" in result)
-        self.assertEquals(len(result["device_states"]), 82)
+        self.assertEqual(len(result["device_states"]), 84)
 
     def test_device_udevadm(self):
         """Device states can be in a udevadm info element."""
         result = self.getResult("submission_info_udevadm.xml")
         self.assertTrue("device_states" in result)
-        self.assertEquals(len(result["device_states"]), 82)
+        self.assertEqual(len(result["device_states"]), 84)
 
     def test_device_dmidecode(self):
         """Device states can be in a dmidecode info element."""
         result = self.getResult("submission_info_dmidecode.xml")
         self.assertTrue("device_states" in result)
-        self.assertEquals(len(result["device_states"]), 5)
+        self.assertEqual(len(result["device_states"]), 5)
 
     def test_package_versions(self):
         """Package versions are in the packages element."""
         result = self.getResult("submission_packages.xml")
         self.assertTrue("package_versions" in result)
-        self.assertEquals(len(result["package_versions"]), 1)
+        self.assertEqual(len(result["package_versions"]), 1)
 
         package_version = result["package_versions"][0]
-        self.assertEquals(package_version["name"], "accountsservice")
-        self.assertEquals(package_version["version"], "0.6.21-6ubuntu2")
+        self.assertEqual(package_version["name"], "accountsservice")
+        self.assertEqual(package_version["version"], "0.6.21-6ubuntu2")
 
     def test_test_results(self):
         """Test results are in the questions element."""
         result = self.getResult("submission_questions.xml")
         self.assertTrue("test_results" in result)
-        self.assertEquals(len(result["test_results"]), 1)
+        self.assertEqual(len(result["test_results"]), 1)
 
         test_result = result["test_results"][0]
-        self.assertEquals(
+        self.assertEqual(
             test_result["name"], "audio/alsa_record_playback_external")
-        self.assertEquals(test_result["output"], "")
-        self.assertEquals(test_result["status"], "pass")
+        self.assertEqual(test_result["output"], "")
+        self.assertEqual(test_result["status"], "pass")
 
=== modified file 'checkbox/parsers/tests/test_xinput.py'
--- checkbox/parsers/tests/test_xinput.py	2012-10-22 19:43:04 +0000
+++ checkbox/parsers/tests/test_xinput.py	2013-05-09 20:11:45 +0000
@@ -38,8 +38,8 @@
             """⎡ Virtual core pointer                      """
             """id=2    [master pointer  (3)]""")
         self.assertTrue(match)
-        self.assertEquals(match.group("name"), "Virtual core pointer")
-        self.assertEquals(match.group("id"), "2")
+        self.assertEqual(match.group("name"), "Virtual core pointer")
+        self.assertEqual(match.group("id"), "2")
 
 
 class TestAttributeRe(TestCase):
@@ -47,8 +47,8 @@
     def test_string(self):
         match = ATTRIBUTE_RE.match("""Buttons supported: 12""")
         self.assertTrue(match)
-        self.assertEquals(match.group("key"), "Buttons supported")
-        self.assertEquals(match.group("value"), "12")
+        self.assertEqual(match.group("key"), "Buttons supported")
+        self.assertEqual(match.group("value"), "12")
 
 
 class TestClassValueRe(TestCase):
@@ -56,7 +56,7 @@
     def test_string(self):
         match = CLASS_VALUE_RE.match("""12. Type: XIButtonClass""")
         self.assertTrue(match)
-        self.assertEquals(match.group("class"), "XIButtonClass")
+        self.assertEqual(match.group("class"), "XIButtonClass")
 
 
 class TestListValueRe(TestCase):
@@ -65,10 +65,10 @@
         elements = LIST_VALUE_RE.split(
             """"Button Horiz Wheel Right" None None""")[1::2]
         self.assertTrue(elements)
-        self.assertEquals(len(elements), 3)
-        self.assertEquals(elements[0], '"Button Horiz Wheel Right"')
-        self.assertEquals(elements[1], "None")
-        self.assertEquals(elements[2], "None")
+        self.assertEqual(len(elements), 3)
+        self.assertEqual(elements[0], '"Button Horiz Wheel Right"')
+        self.assertEqual(elements[1], "None")
+        self.assertEqual(elements[2], "None")
 
 
 class XinputResult(IXinputResult):
@@ -86,50 +86,45 @@
 
 class TestXinputParser(TestCase):
 
-    def getFixture(self, name):
-        return os.path.join(os.path.dirname(__file__), "fixtures", name)
-
-    def getParser(self, name):
-        fixture = self.getFixture(name)
-        stream = open(fixture, encoding="utf-8")
-        return XinputParser(stream)
 
     def getResult(self, name):
-        parser = self.getParser(name)
+        fixture = os.path.join(os.path.dirname(__file__), "fixtures", name)
         result = XinputResult()
-        parser.run(result)
+        with open(fixture, encoding="utf-8") as stream:
+            parser = XinputParser(stream)
+            parser.run(result)
         return result
 
     def test_number_of_devices_with_spaces(self):
         """The toshiba xinput with spaces contains 12 devices."""
         result = self.getResult("xinput_toshiba.txt")
-        self.assertEquals(len(result.devices), 12)
+        self.assertEqual(len(result.devices), 12)
 
     def test_number_of_devices_without_spaces(self):
         """The quantal xinput without spaces contains 14 devices."""
         result = self.getResult("xinput_quantal.txt")
-        self.assertEquals(len(result.devices), 14)
+        self.assertEqual(len(result.devices), 14)
 
     def test_multitouch_touchpad_device(self):
         """The toshiba xinput contains a multitouch touchpad device."""
         result = self.getResult("xinput_toshiba.txt")
         devices = [device for device in result.devices.values()
             if device["name"] == "AlpsPS/2 ALPS DualPoint TouchPad"]
-        self.assertEquals(len(devices), 1)
+        self.assertEqual(len(devices), 1)
 
         classes = [cls for cls in devices[0]["classes"]
             if cls["device_class"] == "XITouchClass"]
-        self.assertEquals(len(classes), 1)
-        self.assertEquals(classes[0]["touch_mode"], "dependent")
+        self.assertEqual(len(classes), 1)
+        self.assertEqual(classes[0]["touch_mode"], "dependent")
 
     def test_multitouch_touchscreen_device(self):
         """The quantal xinput contains a multitouch touchscreen device."""
         result = self.getResult("xinput_quantal.txt")
         devices = [device for device in result.devices.values()
             if device["name"] == "Quanta OpticalTouchScreen"]
-        self.assertEquals(len(devices), 1)
+        self.assertEqual(len(devices), 1)
 
         classes = [cls for cls in devices[0]["classes"]
             if cls["device_class"] == "XITouchClass"]
-        self.assertEquals(len(classes), 1)
-        self.assertEquals(classes[0]["touch_mode"], "direct")
+        self.assertEqual(len(classes), 1)
+        self.assertEqual(classes[0]["touch_mode"], "direct")
 
=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2013-03-22 16:14:06 +0000
+++ checkbox/parsers/udevadm.py	2013-05-09 20:11:45 +0000
@@ -454,8 +454,9 @@
         if device.bus == "ieee80211":
             return False
 
-        # Ignore devices without product information
-        if not device.product and device.product_id is None:
+        # Ignore devices without product AND vendor information
+        if (device.product is None and device.product_id is None and
+                device.vendor is None and device.vendor_id is None):
             return True
 
         # Ignore invalid subsystem information
 
=== added file 'checkbox/test_resource.py'
--- checkbox/test_resource.py	1970-01-01 00:00:00 +0000
+++ checkbox/test_resource.py	2013-05-09 20:11:45 +0000
@@ -0,0 +1,347 @@
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+checkbox.test_resource
+======================
+
+Test definitions for :mod:`checkbox.resource`
+"""
+
+from unittest import TestCase
+
+from checkbox.resource import ResourceIterator
+from checkbox.resource import ResourceMap
+
+
+class ResourceMapTests(TestCase):
+
+    def setUp(self):
+        # Create a resource map with two resources:
+        #
+        # 'resource_list' is a list with two values, each with an 'attr'
+        # attribute. This is how resources with multiple values are normally
+        # stored.
+        #
+        # 'resource_tuple' is similar to 'resource_list', holding the same data
+        # but using a tuple instead of a list.
+        #
+        # 'resource_dict' is a dictionary with one attribute 'name'. This is
+        # how resources with one value might be stored.
+        self.resource_map = ResourceMap({
+            'resource_list': [
+                {"attr": "value"},
+                {"attr": "other-value"}
+            ],
+            'resource_tuple': (
+                {"attr": "value"},
+                {"attr": "other-value"}
+            ),
+            'resource_dict': {"attr": "value"},
+            'resource_int': 42,
+        })
+        # This is an empty map, it is used by some of the tests
+        self.empty_map = ResourceMap()
+
+    def test_resource_map_is_a_dict(self):
+        # While it's a derived class it's still a dictionary
+        self.assertIsInstance(self.resource_map, dict)
+
+    def test_missing_resource(self):
+        # Missing resources just raise KeyError as they normally would in a
+        # dictionary
+        with self.assertRaises(KeyError):
+            self.resource_map['resource_missing']
+
+    def test_existing_resource_list(self):
+        # Accessing a resource wrapped in a list returns a ResourceIterator
+        thing = self.resource_map['resource_list']
+        self.assertIsInstance(thing, ResourceIterator)
+
+    def test_existing_resource_tuple(self):
+        # Accessing a resource wrapped in a tuple returns a ResourceIterator
+        thing = self.resource_map['resource_tuple']
+        self.assertIsInstance(thing, ResourceIterator)
+
+    def test_existing_resource_dict(self):
+        # Accessing a resource wrapped in a dict returns a ResourceIterator
+        thing = self.resource_map['resource_dict']
+        self.assertIsInstance(thing, ResourceIterator)
+
+    def test_existing_resource_int(self):
+        # Accessing a resource wrapped in a int returns the value directly
+        thing = self.resource_map['resource_int']
+        self.assertIsInstance(thing, int)
+        # The helper integer is 42
+        self.assertEqual(thing, 42)
+
+    def test_eval_smoke(self):
+        # Evaluating anything valid against an empty map returns None
+        self.assertIs(None, self.empty_map.eval("resource.attr == 'value'"))
+        # Evaluating borked code against an empty map also returns None
+        self.assertIs(None, self.empty_map.eval("adpasdasd .asdaasd asd a"))
+
+    def test_under_results(self):
+        # The resource map has an instance variable, _results that is only
+        # assigned after the call to ResourceMap.eval().
+        with self.assertRaises(AttributeError):
+            self.empty_map._results
+        # Calling eval() initializes/overrides it
+        self.empty_map.eval('')
+        # With an empty list (that list may contain other values normally but
+        # with an empty resource map it is always empty)
+        self.assertEqual(self.empty_map._results, [])
+
+    def test_eval_globals(self):
+        # ResourceMap.eval() has a fixed list of globals
+        #
+        # We can poke at that list by using specially crafted expressions.
+        # Each time the expression evaluates to 1, we get an empty list back.
+        self.assertEqual([], self.empty_map.eval("'bool' in globals() and 1"))
+        self.assertEqual([], self.empty_map.eval("'float' in globals() and 1"))
+        self.assertEqual([], self.empty_map.eval("'int' in globals() and 1"))
+        self.assertEqual([], self.empty_map.eval("'str' in globals() and 1"))
+        # Each of those globals is a special ResourceBuiltin object
+        self.assertEqual([], self.resource_map.eval(
+            "bool.__class__.__name__ == 'ResourceBuiltin'"))
+        self.assertEqual([], self.resource_map.eval(
+            "float.__class__.__name__ == 'ResourceBuiltin'"))
+        self.assertEqual([], self.resource_map.eval(
+            "int.__class__.__name__ == 'ResourceBuiltin'"))
+        self.assertEqual([], self.resource_map.eval(
+            "str.__class__.__name__ == 'ResourceBuiltin'"))
+        # Unfortunately, __builtins__ is also in the global scope
+        #
+        # With builtins being available we have a way to access anything in
+        # python via __import__
+        self.assertEqual([], self.empty_map.eval(
+            "'__builtins__' in globals() and 1"))
+        # There are no other globals than what was checked for above:
+        #
+        # The goal is to ensure that there are only particular globals
+        # in the context that is being used to evaluate the expression.
+        #
+        # We cannot return the value directly and compare it outside
+        # (well we can but that trick is used later to keep this code
+        # simple and portable across changes in checkbox)
+        #
+        # The return value of globals().keys() is a special dict_keys() proxy
+        # that returns the items in undetermined order.
+        #
+        # The result is a simple comparison of two sorted list generated by
+        # list comprehensions from iterating over all the keys in global() and
+        # in the list of expected global symbols
+        self.assertEqual([], self.empty_map.eval(
+            "sorted([x for x in globals().keys()])"
+            " == "
+            "sorted(['__builtins__', 'bool', 'float', 'int', 'str'])"))
+
+    def test_eval_locals(self):
+        # As with the globals test above, this test checks what kind of locals
+        # are available inside the execution context.
+        #
+        # In the example of an empty map, the result is -- no locals!
+        self.assertEqual([], self.empty_map.eval(
+            "sorted([x for x in locals().keys()])"
+            " == "
+            "[]"))
+        # In the example of a resource map with several resources the result
+        # are those resources (after wrapping in ResourceIterator)
+        self.assertEqual([], self.resource_map.eval(
+            "sorted([x for x in locals().keys()])"
+            " == "
+            "sorted(['resource_list', 'resource_tuple',"
+            "        'resource_dict', 'resource_int'])"))
+        # Let's just ensure that those are not the raw values anymore Note that
+        # we cannot use 'int', 'list', etc. directly they are wrapped in
+        # ResourceBuiltin objects (see test_eval_globals() above)
+        self.assertEqual([], self.resource_map.eval(
+            "locals()['resource_int'] != (0).__class__"))
+        self.assertEqual([], self.resource_map.eval(
+            "locals()['resource_dict'] != ({}).__class__"))
+        self.assertEqual([], self.resource_map.eval(
+            "locals()['resource_list'] != ([]).__class__"))
+        self.assertEqual([], self.resource_map.eval(
+            "locals()['resource_tuple'] != (()).__class__"))
+
+    def test_eval_import(self):
+        # The expression can import arbitrary python package
+        #
+        # Here we import the subprocess module, execute /bin/false which
+        # returns 1, this makes the expression True in the terms of checkbox
+        # resource programs.
+        self.assertEqual([], self.empty_map.eval(
+            "__import__('subprocess').call('/bin/false')"))
+
+    def test_eval_can_mutate_results(self):
+        # The ResourceMap._results object can be accessed and mutated
+        # by using locals(). Calling locals() inside the expression literally
+        # returns the ResourceMap instance.
+        #
+        # Using that trick, any operation can be performed, including mutating
+        # or replacing the results object.
+        results = self.empty_map.eval(
+            "1 "
+            "if getattr(locals(), '_results').append('payload') "
+            "is None "
+            "else 0")
+        self.assertIs(self.empty_map._results, results)
+        self.assertEqual(results, ['payload'])
+
+    def test_eval_return_value_for_int_resources(self):
+        # This test explores how resource_map.eval() result gets
+        # computed and what it really is in practice.
+        #
+        # The important aspect of this code is that it relies on
+        # ResourceMap._results being shared by ResourceMap, ResourceIterator
+        # and ResourceObject. This makes testing the behavior in isolation
+        # difficult.
+        #
+        # Technically _results are mutated only in ResourceIterator (in the
+        # __contains__ function) and in the ResourceObject (in the _try
+        # function that is in turn called from all overridden special functions
+        # like __eq__) both of those places call _results.append().
+        #
+        # The appended value is either the element of the ResourceIterator
+        # (technically the value) and the converted value of the attribute in
+        # ResourceObject._try. This is rather confusing so let's see what
+        # happens in practice.
+        #
+        # Let's explore resource_list first (the flow is the same for all other
+        # types so the explanations are only given once).
+        #
+        # Here each value was a simple dictionary with 'attr' key wrapped in a
+        # list. As checked earlier by test_existing_resource_list() that list
+        # is converted to a ResourceIterator. Accessing any attribute on the
+        # resource iterator creates a ResourceObject bound to that attribute
+        # name and the iterator. Calling the equality operator on a
+        # ResourceObject calls ResourceObject.__eq__() which in turns calls
+        # ResourceObject._try() The _try() function iterates over the
+        # ResourceIterator and checks of any of the items returned (which are
+        # the raw items as passed to ResourceMap initially) have an entry
+        # corresponding to the attribute name (that was accessed on
+        # ResourceIterator), if so, the value is looked up, converted using the
+        # convert function (identity by default), and passed to the helper
+        # function (that corresponds to the logical operation performed by
+        # whatever called _try, for example, __eq__ calls lambda a, b: a == b).
+        # If the return value of that function matches the expected sentinel
+        # object (True is used by default) then the loop over the iterator
+        # (inside _try()) is broken and the original item (the dictionary or
+        # other object that was initially passed to the ResourceMap) is
+        # appended. Lastly the _try() method returns the sentinel object (True
+        # by default) there was a match (the loop got broken) or the default
+        # value (False by default) otherwise. This is all pretty complicated
+        # but in the case of all-defaults it's pretty much equivalent to:
+        #
+        # results = [
+        #     object
+        #     for object in resource_map[resource_name]
+        #     if object.get(resource_attr) == expected_value]
+        #
+        # Let's see how that works in practice.
+        # Note that the == operator can be replaced by any operator
+        # supported by ResourceObject (<, <=, >, >=, =, !=, in)
+        self.assertEqual(
+            self.resource_map.eval("resource_list.attr == 'value'"),
+            [{'attr': 'value'}])
+        self.assertEqual(
+            self.resource_map.eval("resource_list.attr in ['value']"),
+            [{'attr': 'value'}])
+        self.assertEqual(
+            self.resource_map.eval("resource_list.attr != 'value'"),
+            [{'attr': 'other-value'}])
+        # The inequality operator used with a value that does not exist in the
+        # resource produces the full list of resources back.
+        self.assertEqual(
+            self.resource_map.eval("resource_list.attr != 'foo'"),
+            [{'attr': 'value'}, {'attr': 'other-value'}])
+
+    def test_eval_return_value_for_tuple_resources(self):
+        # Set of identical tests for resource_tuple
+        self.assertEqual(
+            self.resource_map.eval("resource_tuple.attr == 'value'"),
+            [{'attr': 'value'}])
+        self.assertEqual(
+            self.resource_map.eval("resource_tuple.attr in ['value']"),
+            [{'attr': 'value'}])
+        self.assertEqual(
+            self.resource_map.eval("resource_tuple.attr != 'value'"),
+            [{'attr': 'other-value'}])
+
+    def test_eval_return_value_for_dict_resources(self):
+        # Set of identical tests for resource_dict
+        self.assertEqual(
+            self.resource_map.eval("resource_dict.attr == 'value'"),
+            [{'attr': 'value'}])
+        self.assertEqual(
+            self.resource_map.eval("resource_dict.attr in ['value']"),
+            [{'attr': 'value'}])
+        # Here the result is slightly different. This is because there are no
+        # matches (there is no 'other-value' like in previous cases). In such
+        # case the whole expression does not evaluate to True and the return
+        # value is None.
+        self.assertEqual(
+            self.resource_map.eval("resource_dict.attr != 'value'"),
+            None)
+
+    def test_eval_return_value_for_other_resources(self):
+        # Set of identical tests for resource_int
+        #
+        # Here resource_int is not wrapped in a ResourceIterator and unexpected
+        # things start to happen. There is no logic to modify the result in
+        # such case so although the result of the comparison is True the result
+        # of the eval() function is the empty results list.
+        #
+        # I suspect that such cases were never meant to happen and are an
+        # oversight from the initial implementation and lack of testing beyond
+        # the expected working cases.
+        self.assertEqual(
+            self.resource_map.eval("resource_int == 42"),
+            [])
+        # Confusingly enough, but consistently, when the expression evaluates
+        # the False the eval() function returns None.
+        self.assertEqual(
+            self.resource_map.eval("resource_int != 42"),
+            None)
+
+    def test_eval_return_logic_bool(self):
+        # There is some extra logic in eval() that should be documented.
+        # The return value of the low-level eval() call inside the
+        # ResourceMap.eval() method is passed to a set of tests to determine if
+        # it is 'true enough' to return the results. Those tests include:
+        # 1) A boolean value which is True
+        self.assertEqual([], self.empty_map.eval("True"))
+        self.assertEqual(None, self.empty_map.eval("False"))
+
+    def test_eval_return_logic_int(self):
+        # 2) A non-zero integer
+        self.assertEqual([], self.empty_map.eval("1"))
+        self.assertEqual(None, self.empty_map.eval("0"))
+
+    def test_eval_return_logic_tuple(self):
+        # 3) A tuple with at least one True object
+        self.assertEqual([], self.empty_map.eval("(True,)"))
+        self.assertEqual([], self.empty_map.eval("(False, True, 7)"))
+        self.assertEqual(None, self.empty_map.eval("(False, 7)"))
+        self.assertEqual(None, self.empty_map.eval("(7,)"))
+        self.assertEqual(None, self.empty_map.eval("()"))
+
+    def test_eval_return_logic_list(self):
+        # Sadly this does not apply to lists
+        self.assertEqual(None, self.empty_map.eval("[True]"))
 
=== modified file 'checkbox/tests/__init__.py'
--- checkbox/tests/__init__.py	2007-09-18 15:26:03 +0000
+++ checkbox/tests/__init__.py	2013-05-09 20:11:45 +0000
@@ -0,0 +1,49 @@
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+:mod:`checkbox.tests` -- auxiliary test loaders for checkbox
+============================================================
+"""
+
+from inspect import getabsfile
+from unittest.loader import defaultTestLoader
+import os
+
+import checkbox
+
+
+def load_unit_tests():
+    """
+    Load all unit tests and return a TestSuite object
+    """
+    # Discover all unit tests. By simple convention those are kept in
+    # python modules that start with the word 'test_' .
+    return defaultTestLoader.discover(
+        os.path.dirname(getabsfile(checkbox)))
+
+
+def test_suite():
+    """
+    Test suite function used by setuptools test loader.
+
+    Uses unittest test discovery system to get a list of test cases defined
+    inside checkbox. See setup.py setup(test_suite=...) for a matching entry
+    """
+    return load_unit_tests()
 
=== modified file 'checkbox/tests/test_job.py'
--- checkbox/tests/test_job.py	2012-10-09 13:32:06 +0000
+++ checkbox/tests/test_job.py	2013-05-09 20:11:45 +0000
@@ -16,22 +16,23 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-import os
 import unittest
+
 from checkbox.job import Job
 
+
 class JobTest(unittest.TestCase):
 
     def test_command_not_found(self):
-        job = Job('xwonkt','',10)
+        job = Job('xwonkt', '', 10)
         status, data, duration = job.execute()
         #data is expected to be bytes
         self.assertTrue(isinstance(data, bytes))
 
     def test_existing_command(self):
         test_string = 'checkbox'
-        job = Job('echo -n "%s"' % test_string,'',10)
+        job = Job('echo -n "%s"' % test_string, '', 10)
         status, data, duration = job.execute()
         #data is expected to be bytes
         self.assertTrue(isinstance(data, bytes))
-        self.assertEquals(data, test_string.encode())
+        self.assertEqual(data, test_string.encode())
 
=== modified file 'checkbox/tests/test_message_files.py'
--- checkbox/tests/test_message_files.py	2012-12-12 13:13:12 +0000
+++ checkbox/tests/test_message_files.py	2013-05-09 20:11:45 +0000
@@ -74,13 +74,14 @@
                 if 'environ' in message:
                     environ_variables = re.findall(environ_variables_regex, 
                                                    message['environ'])
-                self.assertEquals(set(environ_variables),
+                self.assertEqual(set(environ_variables),
                                   set(shell_variables),
                                   message['name'])
 
     def test_jobs_comply_with_schema(self):
         globals = {}
-        exec(open("plugins/jobs_info.py").read(), globals)
+        with open("plugins/jobs_info.py", "rt") as stream:
+            exec(stream.read(), globals)
         job_schema = globals["job_schema"]
         for message in self.messages:
             long_ext = "_extended"
 
=== modified file 'checkbox/tests/test_setup_files.py'
--- checkbox/tests/test_setup_files.py	2012-10-09 13:32:06 +0000
+++ checkbox/tests/test_setup_files.py	2013-05-09 20:11:45 +0000
@@ -37,7 +37,8 @@
         self.assertEqual(rfc822deb_from_config, existing_files)
 
     def test_job_files_in_potfiles(self):
-        potfile_lines = [line.strip() for line in open('po/POTFILES.in','r')]
+        with open('po/POTFILES.in', 'rt') as stream:
+            potfile_lines = [line.strip() for line in stream]
         potfile_jobfiles = [file for file in potfile_lines if "rfc822deb" in file]
         potfile_jobfiles = [line.split(']')[1].strip() 
                             for line in potfile_jobfiles if ']' in line]
@@ -47,7 +48,8 @@
         self.assertEqual(potfile_jobfiles, existing_files)
 
     def test_job_files_in_local_txt(self):
-        local_lines = [line.strip() for line in open('jobs/local.txt.in','r')]
+        with open('jobs/local.txt.in','rt') as stream:
+            local_lines = [line.strip() for line in stream]
         local_jobfiles = [file for file in local_lines if "$CHECKBOX_SHARE/jobs" in file]
         local_jobfiles = [re.search('\$CHECKBOX_SHARE\/(?P<job_file>jobs\/(.+)\.txt)\?.*',
                           file).group('job_file')+".in" for file in local_jobfiles]
 
=== modified file 'checkbox/user_interface.py'
--- checkbox/user_interface.py	2012-10-17 19:00:19 +0000
+++ checkbox/user_interface.py	2013-05-09 20:11:45 +0000
@@ -16,25 +16,20 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
-import re
+import gettext
+import logging
 import os
 import pwd
-import sys
-import logging
+import re
 import subprocess
 import webbrowser
 
-import gettext
-from gettext import gettext as _
-
 from checkbox.contrib.REThread import REThread
-
 from checkbox.lib.environ import (
     add_variable,
     get_variable,
     remove_variable,
     )
-
 from checkbox.job import (
     FAIL,
     PASS,
@@ -134,10 +129,10 @@
         return
 
     def show_text(self, text, previous=None, next=None):
-        return
+        print(text)
 
-    def show_entry(self, text, value, label=None, previous=None, next=None):
-        return value
+    def show_entry(self, text, value, label=None, showSubmitToHexr=False, previous=None, next=None):
+        return (value, False)
 
     def show_check(self, text, options=[], default=[]):
         return default
 
=== modified file 'checkbox/variables.py'
--- checkbox/variables.py	2012-06-01 15:45:08 +0000
+++ checkbox/variables.py	2013-05-09 20:11:45 +0000
@@ -215,7 +215,7 @@
         for schema in self._schemas:
             try:
                 # Only check that the value can be coerced
-                dummy = schema(value=value).get()
+                schema(value=value).get()
                 return value
             except ValueError:
                 pass
@@ -287,6 +287,7 @@
 def get_variable(obj, attribute):
     return get_variables(obj)[attribute]
 
+
 def get_variables(obj):
     from checkbox.attribute import get_attributes
 
 
=== modified file 'checkbox_cli/cli_interface.py'
--- checkbox_cli/cli_interface.py	2012-10-14 01:04:59 +0000
+++ checkbox_cli/cli_interface.py	2013-05-09 20:11:45 +0000
@@ -342,10 +342,10 @@
         dialog = CLIChoiceDialog(text)
         dialog.run()
 
-    def show_entry(self, text, value, label=None, previous=None, next=None):
+    def show_entry(self, text, value, showSubmitToHexr=False, label=None, previous=None, next=None):
         dialog = CLILineDialog(text)
 
-        return dialog.run()
+        return (dialog.run(), False)
 
     def show_check(self, text, options=[], default=[]):
         dialog = CLIChoiceDialog(text)
@@ -363,7 +363,7 @@
             result = options[response]
             self._toggle_results(result, options, results)
 
-        return results
+        return (results, False)
 
     def show_radio(self, text, options=[], default=None):
         dialog = CLIChoiceDialog(text)
 
=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2012-06-12 15:03:42 +0000
+++ checkbox_gtk/gtk_interface.py	2013-05-09 20:11:45 +0000
@@ -288,7 +288,7 @@
         self._set_button("button_next", next_state)
 
     @GTKHack
-    def show_entry(self, text, value, label=None, previous=None, next=None):
+    def show_entry(self, text, value, showSubmitToHexr=False, label=None, previous=None, next=None):
         #Reset window title
         self._set_main_title()
         # Set buttons
@@ -310,7 +310,7 @@
 
         entered_value = self._get_text("entry")
         self._set_text("entry","")
-        return entered_value
+        return (entered_value, False)
 
     @GTKHack
     def show_check(self, text, options=[], default=[]):
 
=== modified file 'checkbox_qt/qt_interface.py'
--- checkbox_qt/qt_interface.py	2012-09-27 15:27:01 +0000
+++ checkbox_qt/qt_interface.py	2013-05-09 20:11:45 +0000
@@ -111,7 +111,7 @@
         self.qtiface.showText(text)
         self.wait_on_signals(fullTestsClicked=onFullTestsClicked)
 
-    def show_entry(self, text, value, label='', previous=None, next=None):
+    def show_entry(self, text, value, label='', showSubmitToHexr=False, previous=None, next=None):
         def onSubmitTestsClicked():
             self.loop.quit()
 
@@ -127,9 +127,9 @@
         if value is None:
             value = ''
 
-        self.qtiface.showEntry(text, value, label)
+        self.qtiface.showEntry(text, value, label, showSubmitToHexr)
         self.wait_on_signals(submitTestsClicked=onSubmitTestsClicked)
-        return self.qtiface.getSubmissionData()
+        return (self.qtiface.getSubmissionData(), self.qtiface.getSubmitToHexr())
 
     def show_check(self, text, options=[], default=[]):
         return False
 
=== modified file 'checkbox_urwid/urwid_interface.py'
--- checkbox_urwid/urwid_interface.py	2012-06-12 15:03:42 +0000
+++ checkbox_urwid/urwid_interface.py	2013-05-09 20:11:45 +0000
@@ -977,10 +977,10 @@
         return dialog.response
 
 
-    def show_entry(self, text, value, label=None, previous=None, next=None):
+    def show_entry(self, text, value, showSubmitToHexr=False, label=None, previous=None, next=None):
         dialog = InputDialog(text).run()
         self.direction = dialog.direction
-        return dialog.response
+        return (dialog.response, False)
 
 
     def show_check(self, text, options=[], default=None):
 
=== added file 'data/whitelists/hwsubmit.whitelist'
--- data/whitelists/hwsubmit.whitelist	1970-01-01 00:00:00 +0000
+++ data/whitelists/hwsubmit.whitelist	2013-05-09 20:11:45 +0000
@@ -0,0 +1,24 @@
+cdimage
+cpuinfo
+device
+dmi
+dpkg
+gconf
+lsb
+meminfo
+module
+package
+uname
+usb
+__info__
+cpuinfo_attachment
+dmesg_attachment
+dmi_attachment
+dmidecode_attachment
+lsmod_attachment
+lspci_attachment
+modprobe_attachment
+modules_attachment
+sysfs_attachment
+sysctl_attachment
+udev_attachment
 
=== added file 'data/whitelists/sru.whitelist'
--- data/whitelists/sru.whitelist	1970-01-01 00:00:00 +0000
+++ data/whitelists/sru.whitelist	2013-05-09 20:11:45 +0000
@@ -0,0 +1,114 @@
+## This whitelist contains tests that are useful for validating a Stable
+## Release Update (SRU) on Ubuntu Certified systems.  This whitelist is not
+## recommended for, nor will it be accepted for self-testing purposes.
+cpuinfo
+cdimage
+dmi
+dpkg
+efi
+environment
+gconf
+lsb
+meminfo
+memory_card
+module
+package
+device
+uname
+sleep
+block_device
+xinput
+#File Attachment Jobs
+__info__
+acpi_sleep_attachment
+codecs_attachment
+cpuinfo_attachment
+dmesg_attachment
+dmi_attachment
+dmidecode_attachment
+efi_attachment
+lspci_attachment
+meminfo_attachment
+modprobe_attachment
+modules_attachment
+sysctl_attachment
+sysfs_attachment
+udev_attachment
+lsmod_attachment
+#SRU Test Suite Jobs
+__audio__
+audio/alsa_record_playback_automated
+__bluetooth__
+bluetooth/detect-output
+__camera__
+camera/multiple-resolution-images
+__cpu__
+cpu/scaling_test
+cpu/scaling_test-log-attach
+cpu/offlining_test
+cpu/topology
+__disk__
+disk/read_performance
+disk/read_performance_.*
+__graphics__
+graphics/xorg-version
+graphics/compiz_check
+graphics/xorg-failsafe
+graphics/xorg-process
+graphics/screenshot
+screenshot.jpg
+graphics/screenshot_fullscreen_video
+screenshot_fullscreen_video.jpg
+__install__
+install/apt-get-gets-updates
+__mediacard__
+mediacard/sd-preinserted
+__memory__
+memory/info
+memory/check
+__networking__
+networking/detect
+networking/http
+networking/internet
+networking/ping
+__power-management__
+power-management/tickless_idle
+power-management/rtc
+power-management/fwts_wakealarm
+power-management/fwts_wakealarm-log-attach
+__usb__
+usb/detect
+usb/storage-preinserted
+__wireless__
+wireless/wireless_scanning
+wireless/wireless_connection_wpa_bg
+wireless/wireless_connection_open_bg
+wireless/wireless_connection_wpa_n
+wireless/wireless_connection_open_n
+wireless/monitor_wireless_connection_udp
+__suspend__
+suspend/audio_before_suspend
+suspend/bluetooth_obex_send_before_suspend
+suspend/bluetooth_obex_browse_before_suspend
+suspend/bluetooth_obex_get_before_suspend
+suspend/cpu_before_suspend
+suspend/network_before_suspend
+suspend/memory_before_suspend
+suspend/suspend_advanced_auto
+suspend/suspend-single-log-check
+suspend/audio_after_suspend_auto
+suspend/network_resume_time_auto
+suspend/wifi_resume_time_auto
+suspend/record_playback_after_suspend_auto
+suspend/bluetooth_obex_send_after_suspend_auto
+suspend/bluetooth_obex_browse_after_suspend_auto
+suspend/bluetooth_obex_get_after_suspend_auto
+suspend/cpu_after_suspend_auto
+suspend/memory_after_suspend_auto
+suspend/wireless_connection_after_suspend_wpa_bg_auto
+suspend/wireless_connection_after_suspend_open_bg_auto
+suspend/wireless_connection_after_suspend_wpa_n_auto
+suspend/wireless_connection_after_suspend_open_n_auto
+suspend/gpu_lockup_after_suspend
+suspend/screenshot_after_suspend
+screenshot_after_suspend.jpg
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-03-22 16:14:06 +0000
+++ debian/changelog	2013-05-09 20:11:45 +0000
@@ -1,3 +1,145 @@
+checkbox (0.16) saucy; urgency=low
+
+  * New upstream release (LP: #1178403):
+
+  * Launchpad automated translation updates
+
+  [ Jeff Lane ]
+  * scripts/cpu_offlining: Modified script to no longer offline cpu0 to resolve
+    a bug on ARM. Modified output so most of it is redirected to stderr for
+    fail cases, we don't need that much for success cases. (LP: #1078897) 
+  * jobs/mediacard.txt.in: Modified test instructions to be less confusing
+    (LP: #970857)
+  * scripts/cpu_topology: define the cpuinfo nested dicts on creation rather
+    than define elements during parsing of /proc/cpuinfo (LP: #1111878)
+  * scripts/lsmod_info: Corrected error handling for the check_output() call to
+    trap the correct error. (LP: #1103647)
+  * jobs/camera.txt.in: removed an extraneous requres line for gir1.2
+    scripts/camera_test: added code to determine what version of gst we're
+    using and set video type and plugin accordingly. (LP: #1100594)
+  * scripts/network_check: added ability to specify custom target URL for
+    debugging failures (LP: #1128017)
+  * scripts/sleep_test_log_check: added new script to parse fwts logs for
+    errors
+    jobs/hibernate.txt.in, jobs/stress.txt.in, jobs/suspend.txt.in: added jobs
+    to use the sleep_test_log_check script after s3/s4 tests. Modified current
+    s3/s4 tests to use the new None fail level for fwts_test
+    scripts/fwts_test: no longer fails on fwts errors if "-f none" is chosen.
+    Now it should only fail by manual indication if the actual sleep action
+    fails. (LP: #1169922)
+  * scripts/bluetooth_test: test no longer generates odd Broken Pipe error when
+    the dpkg bit verifies obexftp is installed (LP: #1169488)
+  * jobs/networking.txt.in: fixed networking/info jobs that were not being run
+    because $output was being resolved too early (LP: #1065983)
+  * scripts/memory_compare: cleaned up the output to be more explanatory and
+    easier to visually parse (LP: #1072666)
+  * jobs/miscellanea.txt.in: Added jobs for manual verification of PXE boot and
+    remote IPMI to improve server test coverage.
+  * jobs/led.txt.in: Modified Jobs: led/power, led/wlan, led/wlan-disabled. New
+    jobs: led/power-blink-suspend, led/suspend, led/mute
+    jobs/keys.txt.in: modified keys/wireless
+  * plugins/lock_prompt.py: added a lock release to cleanly clear lock on stop.
+    plugins/persist_prompt.py: promoted save to run before lock release.
+    checkbox/lib/fifo.py: trap OSError exception at close when the input/output
+    fifo fds disappear before fifo.close() can get to them. (LP: #115561)
+  * jobs/info.txt.in: fixed bad driver name in audio_codecs job (LP: #1165215)
+  * jobs/mediacard.txt.in: reduce test file size for MMC to 64MB (LP: #1167214)
+  * jobs/led.txt.in, jobs/suspend.txt.in: removed bits about WLAN LED flashing
+    from the WLAN jobs as that no longer happens on data tx/rx (LP: #1157606)
+  * jobs/power-management.txt.in: added manual reboot and shutdown tests for
+    server and Xen testing.  Took the opportunity to correct punctuation in the
+    descriptions or other manual jobs.
+    jobs/virtualization.txt.in: added virtualization/xen_ok and
+    virtualization/xen_check_vms jobs for Xen testing
+    scripts/xen_test: added script to perform Xen testing
+  * jobs/various: Changed the jobs that use removable_storage_watcher to
+    generate ~256MB files to combat problems where the files are cached and not
+    written directly to devices during test. (LP: #1149213)
+
+
+  [ Sylvain Pineau ]
+  * jobs/suspend.txt.in, scripts/gpu_test: Remove the need of running the script
+    with the root user, restore the workspaces switch and the HTML5 video
+    playback ; remove the extra suspend/resume (LP: #1172851)
+  * checkbox/parsers/udevadm.py: Only filter devices without product AND vendor
+    information (LP: #1167733)
+  * debian/control: Added python3-mock as a build dependency.
+  * debian/rules: Clean __pycache__ directory after running scripts unit tests.
+  * scripts/gputest_benchmark: Added a wrapper for the Geeks3D GpuTest
+    benchmark.
+  * jobs/benchmarks.txt.in: Added the corresponding GpuTest jobs (Furmark,
+    Gimark and Tessmark)
+
+  [ Brendan Donegan ]
+  * scripts/rendercheck_test - change nargs='+' to action='append' for blacklist
+    option so it works as expected.
+    jobs/rendercheck.txt.in - blacklist gradients test as it is known to produce
+    false positives. (LP: #1093718)
+  * plugins/hexr_transport.py - added plugin for submitting to HEXR and 
+    certification based on certify_new_transport from checkbox-certification.
+    examples/checkbox-qt.ini - blacklisted hexr_transport as we won't use it
+    examples/checkbox-cli.ini - blacklisted hexr_transport as we won't use it
+    examples/checkbox-urwid.ini - blacklisted hexr_transport as we won't use it
+  * Add hidden 'Submit to HEXR' checkbox on submission screen, so that it can
+    be utilised in checkbox-certification.
+  * checkbox/user_interface.py - fixed keyword argument in show_entry.
+    checkbox_cli/cli_interface.py - return tuple as expected. (LP: #1173103)
+  * scripts/sources_test - modified script so that it takes sources list
+    location and repository list as arguments
+  * jobs/miscellanea.txt.in - provide REPOSITORY and SOURCES_LIST environment
+    variables to the sources_test script (LP: #1149288)
+  * Added mobile broadband tests and updated create_connection script to allow
+    creation of mobile broadband connections.
+  * scripts/rendercheck_test, scripts/graphics_stress_test, 
+    jobs/rendercheck.txt.in, jobs/stress.txt.in - Allow blacklisting of 
+    specific rendercheck tests and use this to exclude the 'repeat' test
+    from the set of rendercheck tests that run (LP: #1164566)
+  * jobs/benchmarks.txt.in - fix typo in command field of 
+    benchmarks/graphics/globs job (LP: #1157615)
+  * data/whitelists/sru.whitelist - remove bluetooth_obex_before_suspend
+    as it is made redundant by browse/get/send (LP: #1155325)
+
+  [ Po-Hsu Lin ]
+  * jobs/led.txt.in: Modified the description of led/power-blink-suspend test to
+    cover more cases.
+    jobs/suspend.txt.in: Modified the description of suspend/suspend_advanced
+    test cover more cases. (LP: #1172108)
+  * jobs/monitor.txt.in: Modified the description of dim_brightness test to make 
+    it consistent with the code. (LP: #1170244)
+
+  [ Daniel Manrique ]
+  * scripts/alsa_record_playback: Replaced alsasrc with autoaudiosrc
+    (LP: #1059544)
+  * checkbox/parsers/submission.py: Fixed incorrect context for memory
+    parsing, which resulted in absent memory information when parsing
+    xml files.
+  * scripts/glob_test: Fixed swapping of repetitions and time parameters.
+    jobs/benchmarks.txt.in: Set a 26 FPS threshold for passing globs
+    benchmark.
+  * Added sru.whitelist used to test stable release update kernels.
+
+  [ Jeff Marcom ]
+  * scripts/network: added new script for testing and retrieving information for
+    network interfaces.
+  * configs,examples/network.cfg: added config file 
+    for network test configuration and setup
+  * scripts/virtualization - Fixes issue where console terminal would 
+    remain hijacked by child kvm process (LP: #1164028)
+  * jobs/input.txt.in: Added manual check job for accelerometer hardware
+  * scripts/virtualization: Fixed issue where specifying test timeout via 
+    vitualization.cfg was pulled in as a string rather than integer.
+  * scripts/virtualization: Added classmethod for generating cloud 
+    config data based on ISO in use
+
+  [ Zygmunt Krynicki ]
+  * jobs/graphics.txt.in, jobs/suspend.txt.in: convert package resource 
+    programs to be compatible with plainbox
+  * debian/control: add missing build dependency on python3-setuptools
+  * debian/control: add another missing build dependency on python-setuptools
+    (apparently needed because dh_auth_xxx) poke setup.py as python2)
+
+ -- Daniel Manrique <[e-mail]>  Thu, 09 May 2013 14:39:23 -0400
+
 checkbox (0.15.5) raring; urgency=low
 
   * New upstream release (LP: #1158798) 
 
=== added file 'debian/checkbox-hw-collection.install'
--- debian/checkbox-hw-collection.install	1970-01-01 00:00:00 +0000
+++ debian/checkbox-hw-collection.install	2013-05-09 20:11:45 +0000
@@ -0,0 +1,2 @@
+usr/bin/checkbox-hw-collection
+usr/share/checkbox/examples/checkbox-hw-collection.ini
 
=== added file 'debian/checkbox-hw-collection.links'
--- debian/checkbox-hw-collection.links	1970-01-01 00:00:00 +0000
+++ debian/checkbox-hw-collection.links	2013-05-09 20:11:45 +0000
@@ -0,0 +1,1 @@
+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-hw-collection.1.gz
 
=== added file 'debian/checkbox-hw-collection.postinst'
--- debian/checkbox-hw-collection.postinst	1970-01-01 00:00:00 +0000
+++ debian/checkbox-hw-collection.postinst	2013-05-09 20:11:45 +0000
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+base_package="checkbox"
+. /usr/share/debconf/confmodule
+. /usr/share/checkbox/install/postinst
+
+#DEBHELPER#
 
=== modified file 'debian/checkbox.install'
--- debian/checkbox.install	2012-07-12 16:35:37 +0000
+++ debian/checkbox.install	2013-05-09 20:11:45 +0000
@@ -10,6 +10,7 @@
 usr/share/checkbox/plugins/*
 usr/share/checkbox/report/*
 usr/share/checkbox/examples/checkbox.ini
+usr/share/checkbox/examples/network.cfg
 usr/lib/python*/*-packages/checkbox/*
 usr/lib/checkbox/bin/*
 usr/share/apport/package-hooks/source_checkbox.py
 
=== modified file 'debian/control'
--- debian/control	2013-01-09 21:20:03 +0000
+++ debian/control	2013-05-09 20:11:45 +0000
@@ -10,10 +10,13 @@
                po-debconf,
                python,
                python-distutils-extra,
+               python-setuptools,
+               python3-setuptools,
                python3-all,
                python3-distutils-extra,
                python3-gi,
                python3-lxml,
+               python3-mock,
                python3-pkg-resources,
                qt4-qmake
 Vcs-Bzr: https://code.launchpad.net/~hardware-certification/checkbox/trunk
@@ -41,6 +44,7 @@
 Suggests: bonnie++,
           bootchart,
           checkbox-cli | checkbox-gtk,
+          curl,
           ethtool,
           fwts,
           git-core,
@@ -110,3 +114,12 @@
  results can then be sent to Launchpad.
  .
  This package provides a QT4 interface for answering tests.
+
+Package: checkbox-hw-collection
+Architecture: any
+Depends: checkbox (>= ${source:Version}),
+         ${misc:Depends}
+Description: CLI tool for collecting HW information from a system
+ .
+ This package provides a tool for collecting hardware information from
+ a system and sending it to the HEXR hardware database.
 
=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2013-03-22 16:14:06 +0000
+++ debian/po/ast.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-03-21 15:41+0000\n"
 "Last-Translator: Xandru <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
-"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2013-03-22 16:14:06 +0000
+++ debian/po/cs.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-03-05 19:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech <[e-mail]>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/de.po'
--- debian/po/de.po	2013-03-22 16:14:06 +0000
+++ debian/po/de.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-10-06 22:02+0000\n"
 "Last-Translator: Dennis Baudys <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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
@@ -204,7 +203,8 @@
 #. Description
 #: ../checkbox.templates:15001
 msgid "The SSID of the 802.11n router with open security."
-msgstr "Die SSID des 802.11n-Routers mit »Open«-Sicherheitsmodell (unsicher)."
+msgstr ""
+"Die SSID des 802.11n-Routers mit »Open«-Sicherheitsmodell (unsicher)."
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2013-03-22 16:14:06 +0000
+++ debian/po/en_AU.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2013-03-22 16:14:06 +0000
+++ debian/po/en_GB.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-09-26 09:33+0000\n"
 "Last-Translator: Biffaboy <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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/es.po'
--- debian/po/es.po	2013-03-22 16:14:06 +0000
+++ debian/po/es.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-09-21 18:40+0000\n"
 "Last-Translator: Daniel Manrique <[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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
@@ -42,7 +41,8 @@
 #. Description
 #: ../checkbox.templates:2001
 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
@@ -151,7 +151,8 @@
 #. Description
 #: ../checkbox.templates:11001
 msgid "The PSK of the 802.11b/g router with WPA security."
-msgstr "Llave de encriptación (PSK) del enrutador 802.11b/g con seguridad WPA."
+msgstr ""
+"Llave de encriptación (PSK) del enrutador 802.11b/g con seguridad WPA."
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2013-03-22 16:14:06 +0000
+++ debian/po/fr.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-09-25 09:16+0000\n"
 "Last-Translator: Sylvie Gallet <Unknown>\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2013-03-22 16:14:06 +0000
+++ debian/po/gl.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-10-03 21:33+0000\n"
 "Last-Translator: Antón Méixome <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
-"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/he.po'
--- debian/po/he.po	2013-03-22 16:14:06 +0000
+++ debian/po/he.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2013-03-22 16:14:06 +0000
+++ debian/po/hu.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/id.po'
--- debian/po/id.po	2013-03-22 16:14:06 +0000
+++ debian/po/id.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-08-13 10:30+0000\n"
 "Last-Translator: Mei Hua Song <Unknown>\n"
 "Language-Team: Indonesian <[e-mail]>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/it.po'
--- debian/po/it.po	2013-03-22 16:14:06 +0000
+++ debian/po/it.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2013-03-22 16:14:06 +0000
+++ debian/po/ja.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2013-03-22 16:14:06 +0000
+++ debian/po/nl.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/oc.po'
--- debian/po/oc.po	2013-03-22 16:14:06 +0000
+++ debian/po/oc.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-02-24 07:45+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <[e-mail]>\n"
 "Language-Team: Occitan (post 1500) <[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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2013-03-22 16:14:06 +0000
+++ debian/po/pl.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2013-03-22 16:14:06 +0000
+++ debian/po/pt_BR.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-05-12 03:33+0000\n"
 "Last-Translator: eniomarconcini <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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2013-03-22 16:14:06 +0000
+++ debian/po/ro.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2013-03-22 16:14:06 +0000
+++ debian/po/ru.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/tr.po'
--- debian/po/tr.po	2013-03-22 16:14:06 +0000
+++ debian/po/tr.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-05-18 12:51+0000\n"
 "Last-Translator: Hasan Yılmaz <[e-mail]>\n"
 "Language-Team: Turkish <[e-mail]>\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/uk.po'
--- debian/po/uk.po	2013-03-22 16:14:06 +0000
+++ debian/po/uk.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-01-21 07:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2013-03-22 16:14:06 +0000
+++ debian/po/zh_CN.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\n"
 "PO-Revision-Date: 2012-05-09 02:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Simplified) <[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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2013-03-22 16:14:06 +0000
+++ debian/po/zh_TW.po	2013-05-09 20:11:45 +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: 2012-09-21 11:25-0400\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: 2013-02-23 04:42+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-05-01 04:40+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/rules'
--- debian/rules	2012-10-11 20:12:47 +0000
+++ debian/rules	2013-05-09 20:11:45 +0000
@@ -20,6 +20,7 @@
 	# drop LD_PRELOAD to avoid running under fakeroot; drop TMPDIR to work
 	# around LP#972324 (set by autopkgtest)
 	env -u LD_PRELOAD -u TMPDIR CHECKBOX_PACKAGING=1 ./test
+	rm -rf scripts/__pycache__
 endif	
 
 override_dh_installdeb:
 
=== modified file 'examples/checkbox-cli.ini'
--- examples/checkbox-cli.ini	2008-09-01 01:32:14 +0000
+++ examples/checkbox-cli.ini	2013-05-09 20:11:45 +0000
@@ -12,3 +12,6 @@
 # Class implementing the UserInterface interface.
 interface_class = CLIInterface
 
+[checkbox/plugins]
+
+blacklist = hexr_prompt hexr_transport
 
=== added file 'examples/checkbox-hw-collection.ini'
--- examples/checkbox-hw-collection.ini	1970-01-01 00:00:00 +0000
+++ examples/checkbox-hw-collection.ini	2013-05-09 20:11:45 +0000
@@ -0,0 +1,18 @@
+[DEFAULT]
+
+# Space separated list of files to include as a dependency
+includes = %(checkbox_share)s/configs/checkbox.ini
+
+[checkbox/plugins/user_interface]
+
+# Module where the user interface implementation is defined.
+interface_module = checkbox.user_interface
+
+# Class implementing the UserInterface interface.
+interface_class = UserInterface
+
+[checkbox/plugins/intro_prompt]
+welcome_text = Gathering hardware information. You may be prompted for your sudo password. This process will take approximately 20 seconds and you will be provided with a URL through which you can confirm and register your hardware submission.
+
+[checkbox/plugins]
+blacklist = launchpad_prompt launchpad_exchange final_prompt
 
=== modified file 'examples/checkbox-qt.ini'
--- examples/checkbox-qt.ini	2012-05-16 11:36:56 +0000
+++ examples/checkbox-qt.ini	2013-05-09 20:11:45 +0000
@@ -14,3 +14,7 @@
 
 # Path where qt files are stored.
 data_path = %(checkbox_share)s/qt
+
+[checkbox/plugins]
+
+blacklist = hexr_prompt hexr_transport
 
=== modified file 'examples/checkbox-urwid.ini'
--- examples/checkbox-urwid.ini	2010-05-20 09:00:22 +0000
+++ examples/checkbox-urwid.ini	2013-05-09 20:11:45 +0000
@@ -12,3 +12,6 @@
 # Class implementing the UserInterface interface.
 interface_class = UrwidInterface
 
+[checkbox/plugins]
+
+blacklist = hexr_prompt hexr_transport
 
=== added file 'examples/network.cfg'
--- examples/network.cfg	1970-01-01 00:00:00 +0000
+++ examples/network.cfg	2013-05-09 20:11:45 +0000
@@ -0,0 +1,4 @@
+[FTP]
+Target: canonical.com
+User: anonymous
+Pass: 
 
=== modified file 'jobs/audio.txt.in'
--- jobs/audio.txt.in	2012-12-03 22:24:40 +0000
+++ jobs/audio.txt.in	2013-05-09 20:11:45 +0000
@@ -68,6 +68,7 @@
  device.category == 'AUDIO'
  package.name == 'alsa-base'
  package.name == 'pulseaudio-utils'
+ package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
 command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
 _description:
  PURPOSE:
@@ -86,6 +87,7 @@
  device.category == 'AUDIO'
  package.name == 'alsa-base'
  package.name == 'pulseaudio-utils'
+ package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
 command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
 _description:
  PURPOSE:
@@ -103,6 +105,7 @@
  device.category == 'AUDIO'
  package.name == 'alsa-base'
  package.name == 'pulseaudio-utils'
+ package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
 command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=usb --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
 _description:
  PURPOSE:
@@ -202,6 +205,7 @@
  device.category == 'AUDIO'
  package.name == 'alsa-base'
  package.name == 'pulseaudio-utils'
+ package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
 command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
 _description:
  PURPOSE:
 
=== modified file 'jobs/benchmarks.txt.in'
--- jobs/benchmarks.txt.in	2012-10-09 15:21:35 +0000
+++ jobs/benchmarks.txt.in	2013-05-09 20:11:45 +0000
@@ -83,6 +83,14 @@
 _description: Run GLmark2 benchmark
 
 plugin: shell
+name: benchmarks/graphics/globs
+requires:
+ package.name == 'globs'
+ cpuinfo.platform in ("i386", "x86_64")
+command: glob_test --min-fps=26 --ignore-problems
+_description: Run globs benchmark
+
+plugin: shell
 name: benchmarks/graphics/unigine-sanctuary
 requires: package.name == 'phoronix-test-suite'
 command: pts_run unigine-sanctuary
@@ -213,3 +221,63 @@
 requires: package.name == 'sysstat'
 command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("util\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
 _description: Disk utilization on an idle system.
+
+plugin: shell
+name: benchmarks/graphics/gputest_furmark_fullscreen_1920x1080
+requires:
+ package.name == 'gputest'
+ cpuinfo.platform == 'x86_64'
+command: gputest_benchmark fur --width 1920 --height 1080 -f
+_description:
+ Run a stress test based on FurMark (OpenGL 2.1 or 3.2)
+ Fullscreen 1920x1080 no antialiasing
+
+plugin: shell
+name: benchmarks/graphics/gputest_furmark_windowed_1024x640
+requires:
+ package.name == 'gputest'
+ cpuinfo.platform == 'x86_64'
+command: gputest_benchmark fur
+_description:
+ Run a stress test based on FurMark (OpenGL 2.1 or 3.2)
+ Windowed 1024x640 no antialiasing
+
+plugin: shell
+name: benchmarks/graphics/gputest_gimark_fullscreen_1920x1080
+requires:
+ package.name == 'gputest'
+ cpuinfo.platform == 'x86_64'
+command: gputest_benchmark gi --width 1920 --height 1080 -f
+_description:
+ Run GiMark, a geometry instancing test (OpenGL 3.3)
+ Fullscreen 1920x1080 no antialiasing
+
+plugin: shell
+name: benchmarks/graphics/gputest_gimark_windowed_1024x640
+requires:
+ package.name == 'gputest'
+ cpuinfo.platform == 'x86_64'
+command: gputest_benchmark gi
+_description:
+ Run GiMark, a geometry instancing test (OpenGL 3.3)
+ Windowed 1024x640 no antialiasing
+
+plugin: shell
+name: benchmarks/graphics/gputest_tessmark_fullscreen_1920x1080
+requires:
+ package.name == 'gputest'
+ cpuinfo.platform == 'x86_64'
+command: gputest_benchmark tess --width 1920 --height 1080 -f
+_description:
+ Run a tessellation test based on TessMark (OpenGL 4.0)
+ Fullscreen 1920x1080 no antialiasing
+
+plugin: shell
+name: benchmarks/graphics/gputest_tessmark_windowed_1024x640
+requires:
+ package.name == 'gputest'
+ cpuinfo.platform == 'x86_64'
+command: gputest_benchmark tess
+_description:
+ Run a tessellation test based on TessMark (OpenGL 4.0)
+ Windowed 1024x640 no antialiasing
 
=== modified file 'jobs/camera.txt.in'
--- jobs/camera.txt.in	2012-11-06 17:11:49 +0000
+++ jobs/camera.txt.in	2013-05-09 20:11:45 +0000
@@ -9,7 +9,6 @@
 name: camera/display
 depends: camera/detect
 requires:
- package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  device.category == 'CAPTURE'
 command: camera_test display
 _description:
 
=== modified file 'jobs/esata.txt.in'
--- jobs/esata.txt.in	2012-11-12 15:32:12 +0000
+++ jobs/esata.txt.in	2013-05-09 20:11:45 +0000
@@ -16,7 +16,7 @@
 name: esata/storage-test
 user: root
 depends: esata/insert
-command: removable_storage_test ata_serial_esata
+command: removable_storage_test -s 268400000 ata_serial_esata
 _description:
  This is an automated test which performs read/write operations on an attached
  eSATA HDD
 
=== modified file 'jobs/firewire.txt.in'
--- jobs/firewire.txt.in	2012-11-12 15:32:12 +0000
+++ jobs/firewire.txt.in	2013-05-09 20:11:45 +0000
@@ -16,7 +16,7 @@
 name: firewire/storage-test
 user: root
 depends: firewire/insert
-command: removable_storage_test firewire
+command: removable_storage_test -s 268400000 firewire
 _description:
  This is an automated test which performs read/write operations on an attached
  FireWire HDD
 
=== modified file 'jobs/graphics.txt.in'
--- jobs/graphics.txt.in	2013-03-07 15:52:02 +0000
+++ jobs/graphics.txt.in	2013-05-09 20:11:45 +0000
@@ -26,7 +26,9 @@
 
 plugin: shell
 name: graphics/xorg-process
-requires: package.name == 'xorg' and package.name == 'procps'
+requires:
+ package.name == 'xorg'
+ package.name == 'procps'
 command: pgrep -f '/usr/bin/X' >/dev/null
 _description: Test that the X process is running.
 
 
=== modified file 'jobs/hibernate.txt.in'
--- jobs/hibernate.txt.in	2013-01-03 14:58:32 +0000
+++ jobs/hibernate.txt.in	2013-05-09 20:11:45 +0000
@@ -6,7 +6,7 @@
 command:
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  fwts_test -l $CHECKBOX_DATA/hibernate-single -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120
+  fwts_test -l $CHECKBOX_DATA/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120
  else
   echo "Calling sleep_test"
   sleep_test -s disk -w 120
@@ -22,7 +22,13 @@
  VERIFICATION:
      Did the system successfully hibernate and did it work properly after waking up?
 
+plugin: shell
+name: power-management/hibernate-single-log-check
+command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && sleep_test_log_check -v s4 $CHECKBOX_DATA/hibernate-single.log
+_description:
+ Automated check of the hibernate log for errors discovered by fwts
+
 plugin: attachment
 name: power-management/hibernate-single-log-attach
-command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && cat $CHECBOX_DATA/hibernate-single.log
+command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && cat $CHECKBOX_DATA/hibernate-single.log
 description: attaches log from single hibernate/resume test to results
 
=== modified file 'jobs/info.txt.in'
--- jobs/info.txt.in	2012-12-17 21:41:58 +0000
+++ jobs/info.txt.in	2013-05-09 20:11:45 +0000
@@ -1,6 +1,6 @@
 name: codecs_attachment
 plugin: attachment
-requires: device.driver == 'HDA Intel'
+requires: device.driver == 'snd_hda_intel'
 command: cat /proc/asound/card*/codec#*
 _description: Attaches a report of installed codecs for Intel HDA
 
 
=== modified file 'jobs/input.txt.in'
--- jobs/input.txt.in	2013-03-07 15:52:02 +0000
+++ jobs/input.txt.in	2013-05-09 20:11:45 +0000
@@ -41,10 +41,20 @@
  VERIFICATION:
      Is your keyboard working properly?
 
+plugin: manual
+name: input/accelerometer_verify
+_description:
+ PURPOSE:
+     Manual detection of accelerometer.
+ STEPS:
+     1. Look at the specifications for your system.
+ VERIFICATION:
+     Is this system supposed to have an accelerometer?
+
 plugin: user-interact
 name: input/accelerometer
 user: root
-requires: module.name in ['hdaps', 'hp_accel'] 
+depends: input/accelerometer_verify
 command: accelerometer_test -m
 _description:
  PURPOSE:
 
=== modified file 'jobs/keys.txt.in'
--- jobs/keys.txt.in	2012-11-07 21:33:08 +0000
+++ jobs/keys.txt.in	2013-05-09 20:11:45 +0000
@@ -78,9 +78,15 @@
      This test will test the wireless key
  STEPS:
      1. Press the wireless key on the keyboard
-     2. Press the same key again
+     2. Check that the wifi LED turns off or changes color
+     3. Check that wireless is disabled
+     4. Press the same key again
+     5. Check that the wifi LED turns on or changes color
+     6. Check that wireless is enabled
  VERIFICATION:
-     Did the wireless go off on the first press and on again on the second?
+     Did the wireless turn off on the first press and on again on the second?
+     (NOTE: the LED functionality will be reviewed in a following test. Please
+     only consider the functionality of the wifi itself here.)
 
 plugin: user-interact
 name: keys/media-control
 
=== modified file 'jobs/led.txt.in'
--- jobs/led.txt.in	2012-10-27 10:33:23 +0000
+++ jobs/led.txt.in	2013-05-09 20:11:45 +0000
@@ -9,6 +9,29 @@
      Does the power LED light as expected?
 
 plugin: manual
+name: led/power-blink-suspend
+depends: suspend/suspend_advanced
+_description:
+ PURPOSE:
+     Power LED verification
+ STEPS:
+     1. The Power LED should blink or change color while the system is suspended
+ VERIFICATION:
+     Did the Power LED blink or change color while the system was suspended for the previous suspend test?
+
+plugin: manual
+name: led/suspend
+_description:
+ PURPOSE:
+     Suspend LED verification. If your system does not have a dedicated Suspend
+     LED, skip this test.
+ STEPS:
+     1. The Suspend LED should blink or change color while the system is
+     supended
+ VERIFICATION
+     Did the Suspend LED blink or change color while the system was suspended?
+
+plugin: manual
 name: led/battery-charging
 _description:
  PURPOSE:
@@ -81,33 +104,29 @@
 
 plugin: manual
 name: led/wlan
-depends: wireless/wireless_connection
-requires: package.name == 'firefox'
-command: firefox http://www.ubuntu.com
+depends: keys/wireless
 _description:
  PURPOSE:
      WLAN LED verification
  STEPS:
-     1. Make sure WLAN connection is established
-     2. WLAN LED should light
-     3. Select Test to open Firefox
-     4. WLAN LED should flash while downloading data
+     1. During the keys/wireless test you should have observed the
+     wireless LED while turning wireless back on.
+     2. WLAN LED should light or change color when wireless is turned on
  VERIFICATION:
-     Did the WLAN LED light and flash as expected?
+     Did the WLAN LED turn on or change color as expected?
 
 plugin: manual
 name: led/wlan-disabled
-depends: wireless/wireless_connection
+depends: keys/wireless
 _description:
  PURPOSE:
      Validate that WLAN LED shuts off when disabled
  STEPS:
-     1. Connect to AP
-     2. Use Physical switch to disable WLAN
-     3. Re-enable
-     4. Use Network-Manager to disable WLAN
+     1. During the keys/wireless test you should have observed the WLAN LED
+     while performing that test after turning wireless off.
+     2. WLAN LED should turn off or change color when wireless is turned off
  VERIFICATION:
-     Did the LED turn off then WLAN is disabled?
+     Did the WLAN LED turn off or change color as expected?
 
 plugin: manual
 name: led/bluetooth
@@ -164,3 +183,15 @@
  VERIFICATION:
      Did the WLAN/Bluetooth LED light as expected?
 
+plugin: manual
+name: led/mute
+depends: keys/mute
+_description:
+ PURPOSE:
+     Audio Mute LED verification. Skip this test if your system does not have
+     a special Audio Mute LED
+ STEPS:
+     1. Press the Mute key twice and observe the Audio LED to determine if it
+     either turned off and on or changed colors.
+ VERIFICATION:
+     Did the Audio LED turn on and off change color as expected?
 
=== modified file 'jobs/local.txt.in'
--- jobs/local.txt.in	2012-10-23 21:52:31 +0000
+++ jobs/local.txt.in	2013-05-09 20:11:45 +0000
@@ -278,6 +278,13 @@
   shopt -s extglob
   cat $CHECKBOX_SHARE/jobs/wireless.txt?(.in)
 
+name: __mobilebroadband__
+plugin: local
+_description: Mobile broadband tests
+command:
+  shopt -s extglob
+  cat $CHECKBOX_SHARE/jobs/mobilebroadband.txt?(.in)
+
 name: __stress__
 plugin: local
 _description: Stress tests
 
=== modified file 'jobs/mediacard.txt.in'
--- jobs/mediacard.txt.in	2012-11-16 04:25:09 +0000
+++ jobs/mediacard.txt.in	2013-05-09 20:11:45 +0000
@@ -7,8 +7,9 @@
      detect the insertion of a Multimedia Card (MMC) media
  STEPS:
      1. Click "Test" and insert an MMC card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -17,7 +18,7 @@
 name: mediacard/mmc-storage
 depends: mediacard/mmc-insert
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 67120000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/mmc-insert
  test is run. It tests reading and writing to the MMC card.
@@ -47,8 +48,9 @@
      detect the insertion of an MMC card after the system has been suspended
  STEPS:
      1. Click "Test" and insert an MMC card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -57,7 +59,7 @@
 name: mediacard/mmc-storage-after-suspend
 depends: mediacard/mmc-insert-after-suspend
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 67120000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/mmc-insert-after-suspend test
  is run. It tests reading and writing to the MMC card after the system has been suspended.
@@ -86,8 +88,9 @@
      detect the insertion of a Secure Digital (SD) media card
  STEPS:
      1. Click "Test" and insert an SD card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -96,7 +99,7 @@
 name: mediacard/sd-storage
 depends: mediacard/sd-insert
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sd-insert
  test is run. It tests reading and writing to the SD card.
@@ -126,8 +129,9 @@
      detect the insertion of an SD card after the system has been suspended
  STEPS:
      1. Click "Test" and insert an SD card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -136,7 +140,7 @@
 name: mediacard/sd-storage-after-suspend
 depends: mediacard/sd-insert-after-suspend
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _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.
@@ -160,7 +164,7 @@
 name: mediacard/sd-preinserted
 user: root
 requires: device.category == 'CARDREADER'
-command: removable_storage_test --memorycard -l sdio usb scsi && removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard -l sdio usb scsi && removable_storage_test --memorycard sdio usb scsi
 _description:
  This is a fully automated version of mediacard/sd-automated and assumes that the
  system under test has a memory card device plugged in prior to checkbox execution.
@@ -175,8 +179,9 @@
      detect the insertion of a Secure Digital High-Capacity (SDHC) media card
  STEPS:
      1. Click "Test" and insert an SDHC card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -185,7 +190,7 @@
 name: mediacard/sdhc-storage
 depends: mediacard/sdhc-insert
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sdhc-insert
  test is run. It tests reading and writing to the SDHC card.
@@ -215,8 +220,9 @@
      detect the insertion of an SDHC media card after the system has been suspended
  STEPS:
      1. Click "Test" and insert an SDHC card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -225,7 +231,7 @@
 name: mediacard/sdhc-storage-after-suspend
 depends: mediacard/sdhc-insert-after-suspend
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sdhc-insert-after-suspend test
  is run. It tests reading and writing to the SDHC card after the system has been suspended.
@@ -254,8 +260,9 @@
      detect the insertion of a Compact Flash (CF) media card
  STEPS:
      1. Click "Test" and insert a CF card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -264,7 +271,7 @@
 name: mediacard/cf-storage
 depends: mediacard/cf-insert
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/cf-insert
  test is run. It tests reading and writing to the CF card.
@@ -294,8 +301,9 @@
      detect the insertion of a CF card after the system has been suspended
  STEPS:
      1. Click "Test" and insert a CF card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -304,7 +312,7 @@
 name: mediacard/cf-storage-after-suspend
 depends: mediacard/cf-insert-after-suspend
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/cf-insert-after-suspend test
  is run. It tests reading and writing to the CF card after the system has been suspended.
@@ -333,8 +341,9 @@
      detect the insertion of a Secure Digital Extended Capacity (SDXC) media card
  STEPS:
      1. Click "Test" and insert a SDXC card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -343,7 +352,7 @@
 name: mediacard/sdxc-storage
 depends: mediacard/sdxc-insert
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sdxc-insert
  test is run. It tests reading and writing to the SDXC card.
@@ -373,8 +382,9 @@
      detect the insertion of a SDXC card after the system has been suspended
  STEPS:
      1. Click "Test" and insert a SDXC card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -383,7 +393,7 @@
 name: mediacard/sdxc-storage-after-suspend
 depends: mediacard/sdxc-insert-after-suspend
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sdxc-insert-after-suspend test
  is run. It tests reading and writing to the SDXC card after the system has been suspended.
@@ -398,6 +408,7 @@
      of a SDXC card from the systems card reader after the system has been suspended.
  STEPS:
      1. Click "Test" and remove the SDXC card from the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
  VERIFICATION:
      The verification of this test is automated. Do not change the
@@ -412,8 +423,9 @@
      detect the insertion of a Memory Stick (MS) media card
  STEPS:
      1. Click "Test" and insert a MS card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -422,7 +434,7 @@
 name: mediacard/ms-storage
 depends: mediacard/ms-insert
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/ms-insert
  test is run. It tests reading and writing to the MS card.
@@ -452,8 +464,9 @@
      detect the insertion of a MS card after the system has been suspended
  STEPS:
      1. Click "Test" and insert a MS card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -462,7 +475,7 @@
 name: mediacard/ms-storage-after-suspend
 depends: mediacard/ms-insert-after-suspend
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/ms-insert-after-suspend test
  is run. It tests reading and writing to the MS card after the system has been suspended.
@@ -491,8 +504,9 @@
      detect the insertion of a Memory Stick Pro (MSP) media card
  STEPS:
      1. Click "Test" and insert a MSP card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -501,7 +515,7 @@
 name: mediacard/msp-storage
 depends: mediacard/msp-insert
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/msp-insert
  test is run. It tests reading and writing to the MSP card.
@@ -531,8 +545,9 @@
      detect the insertion of a MSP card after the system has been suspended
  STEPS:
      1. Click "Test" and insert a MSP card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -541,7 +556,7 @@
 name: mediacard/msp-storage-after-suspend
 depends: mediacard/msp-insert-after-suspend
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/msp-insert-after-suspend test
  is run. It tests reading and writing to the MSP card after the system has been suspended.
@@ -570,8 +585,9 @@
      detect the insertion of a Extreme Digital (xD) media card
  STEPS:
      1. Click "Test" and insert a xD card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -580,7 +596,7 @@
 name: mediacard/xd-storage
 depends: mediacard/xd-insert
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/xd-insert
  test is run. It tests reading and writing to the xD card.
@@ -610,8 +626,9 @@
      detect the insertion of a xD card after the system has been suspended
  STEPS:
      1. Click "Test" and insert a xD card into the reader.
+        If a file browser opens up, you can safely close it.
         (Note: this test will time-out after 20 seconds.)
-     2. Do not unplug the device after the test.
+     2. Do not remove the device after this test.
  VERIFICATION:
      The verification of this test is automated. Do not change the
      automatically selected result.
@@ -620,7 +637,7 @@
 name: mediacard/xd-storage-after-suspend
 depends: mediacard/xd-insert-after-suspend
 user: root
-command: removable_storage_test --memorycard sdio usb scsi
+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/xd-insert-after-suspend test
  is run. It tests reading and writing to the xD card after the system has been suspended.
 
=== modified file 'jobs/miscellanea.txt.in'
--- jobs/miscellanea.txt.in	2013-01-07 08:53:00 +0000
+++ jobs/miscellanea.txt.in	2013-05-09 20:11:45 +0000
@@ -67,5 +67,56 @@
 
 plugin: shell
 name: miscellanea/sources-list
-command: sources_test
+command: sources_test $SOURCES_LIST "$REPOSITORIES"
 _description: Checks that a specified sources list file contains the requested repositories
+
+plugin: local
+name: miscellanea/pxe_boot
+requires: device.category == 'NETWORK'
+_description: Automated job to generate the PXE verification test for each NIC.
+command:
+ cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
+ plugin: manual
+ name: miscellanea/pxe_boot_$2
+ description:
+  PURPOSE:
+    This test will verify that you have attempted to PXE boot this machine from
+    the network device $2.  
+  STEPS:
+    1. Prior to running this test, you should have attempted to boot this system via PXE on every Network Port available.
+  VERIFICATION:
+    1. Select Yes if you successfully used PXE boot this system using the NIC $2
+    2. Select No if you did not attempt to PXE boot this system using the NIC $2
+    3. Select No if you attempted to PXE boot via $2 and it failed for some reason.
+ EOF
+
+plugin: local
+name: miscellanea/remote_shared_ipmi
+requires: device.category == 'NETWORK'
+_description: Automated job to generate the Remote Shared IPMI verification test for each NIC.
+command:
+ cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
+ plugin: manual
+ name: miscellanea/remote_shared_ipmi_$2
+ description:
+  PURPOSE:
+    This test will verify that you have attempted IPMI control of this machine from the network device $2.  
+  STEPS:
+    1. Prior to running this test, you should have configured and used IPMI to power this machine off and on using every Network Port available.
+  VERIFICATION:
+    1. Select Yes if you successfully used IPMI to remotely power this system off and on using the NIC $2
+    2. Select No if you did not attempt to use IPMI to remotely power this sytem off and on via the NIC $2
+    3. Select No if you attempted to use IPMI to remotely power off/on this system via $2 and it failed for some reason.
+ EOF
+
+plugin: manual
+name: miscellanea/remote_dedicated_ipmi
+_description:
+ PURPOSE:
+  Some systems do not share IPMI over all NICs but instead have a dedicated management port directly connected to the BMC.  This test verifies that you have used that port for remote IPMI connections and actions.
+ STEPS:
+  1. Prior to running the test, you should have configured and used the Dedicated Management Port to remotely power off/on this sytem.
+ VERIFICATION:
+  1. Select Yes if you successfully used IPMI to remotely power this system off and on using the dedicated management port.
+  2. Select No if you attempted to use the dedicated management port to remotely power this system off/on and it failed for some reason.
+  3. Skip this test if this system ONLY uses shared management/ethernet ports OR if this system does not have a BMC (Management Console)
 
=== added file 'jobs/mobilebroadband.txt.in'
--- jobs/mobilebroadband.txt.in	1970-01-01 00:00:00 +0000
+++ jobs/mobilebroadband.txt.in	2013-05-09 20:11:45 +0000
@@ -0,0 +1,21 @@
+plugin: shell
+name: mobilebroadband/gsm_connection
+requires:
+    package.name == 'network-manager'
+    package.name == 'modemmanager'
+    mobilebroadband.gsm == 'supported'
+user: root
+environ: GSM_CONN_NAME GSM_APN GSM_USERNAME GSM_PASSWORD
+command: trap "nmcli con delete id $GSM_CONN_NAME" EXIT; create_connection mobilebroadband gsm `if [ ${GSM_APN} ]; then echo "--apn=$GSM_APN"; fi` `if [ ${GSM_CONN_NAME} ]; then echo "--name=$GSM_CONN_NAME"; fi` `if [ ${GSM_USERNAME} ]; then echo "--username=$GSM_USERNAME"; fi` `if [ ${GSM_PASSWORD} ]; then echo "--password=$GSM_PASSWORD"; fi` && curl http://start.ubuntu.com/connectivity-check.html --interface `nmcli dev status | awk '/gsm/ {print $1}'`
+_description: Creates a mobile broadband connection for a GSM based modem and checks the connection to ensure it's working.
+
+plugin: shell
+name: mobilebroadband/cdma_connection
+requires:
+    package.name == 'network-manager'
+    package.name == 'modemmanager'
+    mobilebroadband.cdma == 'supported'
+user: root
+environ: CDMA_CONN_NAME CDMA_USERNAME CDMA_PASSWORD
+command: trap "nmcli con delete id $CDMA_CONN_NAME" EXIT; create_connection mobilebroadband cdma `if [ ${CDMA_CONN_NAME} ]; then echo "--name=$CDMA_CONN_NAME"; fi` `if [ ${CDMA_USERNAME} ]; then echo "--username=$CDMA_USERNAME"; fi` `if [ ${CDMA_PASSWORD} ]; then echo "--password=$CDMA_PASSWORD"; fi` && curl http://start.ubuntu.com/connectivity-check.html --interface `nmcli dev status | awk '/gsm/ {print $1}'`
+_description: Creates a mobile broadband connection for a CDMA based modem and checks the connection to ensure it's working.
 
=== modified file 'jobs/monitor.txt.in'
--- jobs/monitor.txt.in	2013-01-30 21:43:05 +0000
+++ jobs/monitor.txt.in	2013-05-09 20:11:45 +0000
@@ -66,7 +66,7 @@
 
 plugin: manual
 name: monitor/multi-head
-requires: dmi.product not in ['Notebook','Laptop','Portable']
+requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower']
 _description:
  PURPOSE:
      This test verifies that multi-monitor output works on your desktop system. This is NOT the same test as the external monitor tests you would run on your laptop. If your video card does not support multiple monitors, please skip this test. You will need two monitors to perform this test.
@@ -98,8 +98,8 @@
  PURPOSE:
      This test will test changes to screen brightness
  STEPS:
-     1. Click "Test" to try the to dim the screen.
-     2. Check if the screen was dimmed approximately by half.
+     1. Click "Test" to try to dim the screen.
+     2. Check if the screen was dimmed approximately to half of the maximum brightness.
      3. The screen will go back to the original brightness in 2 seconds.
  VERIFICATION:
-     Was your screen dimmed approximately by half?
+     Was your screen dimmed approximately to half of the maximum brightness?
 
=== modified file 'jobs/networking.txt.in'
--- jobs/networking.txt.in	2012-12-13 18:35:08 +0000
+++ jobs/networking.txt.in	2013-05-09 20:11:45 +0000
@@ -15,10 +15,10 @@
 
 plugin: local
 name: networking/info
-requires: device.category == 'NETWORK' or device.category == 'WIRELESS'
+requires: device.category == 'NETWORK'
 _description: Network Information
 command:
- cat <<'EOF' | run_templates -s '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 echo \$0 \$i; done"'
+ cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
  plugin: manual
  name: networking/info_$2
  requires: device.path == "$1"
@@ -29,7 +29,7 @@
   STEPS:
       1. Please verify the following information for NIC $2
   INFO:
-      $output
+      \$output
   VERIFICATION:
       Is this correct?
  EOF
@@ -117,7 +117,7 @@
   package.name == 'ethtool' and package.name == 'nmap'
   device.path == "$1"
  user: root
- command: ethtool $2 | tail -1 | grep "detected: yes" && network_bandwidth_test --interface=$2 --scan=3 --log-level=debug || ( echo "ERROR: $2 is either not configured or not connected." >&2 && exit 1 )
+ command: network test -i $2 -t ftp
  description:
   Testing for NIC $2
  EOF
 
=== modified file 'jobs/power-management.txt.in'
--- jobs/power-management.txt.in	2012-12-03 14:30:41 +0000
+++ jobs/power-management.txt.in	2013-05-09 20:11:45 +0000
@@ -2,11 +2,11 @@
 name: power-management/shutdown-boot
 _description:
  PURPOSE:
-     This test will check your system shutdown/booting cycle
+     This test will check your system shutdown/booting cycle.
  STEPS:
-     1. Shutdown your machine
-     2. Boot your machine
-     3. Repeat steps 1 and 2 at least 5 times
+     1. Shutdown your machine.
+     2. Boot your machine.
+     3. Repeat steps 1 and 2 at least 5 times.
  VERIFICATION:
      Did the system shutdown and rebooted correctly?
 
@@ -44,9 +44,10 @@
   2. The machine will shut down.
   3. Power the machine back on.
   4. After rebooting, wait for the test prompts to inform you that the test is complete.
-  5. Once the test has completed, restart checkbox and select Re-Run when prompted
+  5. Once the test has completed, restart checkbox and select 'Re-run' when prompted.
  VERIFICATION:
-  If the machine successfully shuts down and boots, select Yes then select Next.
+  If the machine successfully shuts down and boots, select 'Yes', otherwise,
+  select 'No'. 
 
 plugin: attachment
 name: power-management/poweroff-log-attach
@@ -69,7 +70,7 @@
   1. Select "Test" to begin.
   2. The machine will reboot.
   3. After rebooting, wait for the test prompts to inform you that the test is complete.
-  4. Once the test has completed, restart checkbox and select Re-Run when prompted
+  4. Once the test has completed, restart checkbox and select Re-Run when prompted.
  VERIFICATION:
   If the machine successfully reboots, select Yes then select Next.
 
@@ -83,9 +84,9 @@
 name: power-management/lid
 _description:
  PURPOSE:
-     This test will check your lid sensors
+     This test will check your lid sensors.
  STEPS:
-     1. Close your laptop lid
+     1. Close your laptop lid.
  VERIFICATION:
     Does closing your laptop lid cause your system to suspend?
 
@@ -102,8 +103,8 @@
  PURPOSE:
      This test will check your lid sensors
  STEPS:
-     1. Click "Test"
-     2. Close and open the lid
+     1. Click "Test".
+     2. Close and open the lid.
  VERIFICATION:
      Did the screen turn off while the lid was closed?
 
@@ -118,12 +119,12 @@
  exit 1
 _description:
  PURPOSE:
-     This test will check your lid sensors
+     This test will check your lid sensors.
  STEPS:
-     1. Click "Test"
-     2. Close the lid
-     3. Wait 5 seconds with the lid closed
-     4. Open the lid
+     1. Click "Test".
+     2. Close the lid.
+     3. Wait 5 seconds with the lid closed.
+     4. Open the lid.
  VERIFICATION:
      Did the system resume when the lid was opened?
 
@@ -144,10 +145,9 @@
 name: power-management/unplug_ac
 _description:
  PURPOSE:
-     This test will ensure that the AC is unplugged for the battery drain tests
- to run.
+     This test will ensure that the AC is unplugged for the battery drain tests to run.
  STEPS:
-     1. Unplug laptop from AC
+     1. Unplug laptop from AC.
  VERIFICATION:
      Was the laptop unplugged from AC?
 
@@ -187,9 +187,45 @@
 depends: power-management/battery_drain_idle power-management/battery_drain_movie power-management/battery_drain_sleep
 _description:
  PURPOSE:
-     This test will ensure that the AC is plugged back in after the battery
+     This test will ensure that the AC is plugged back in after the battery.
      tests
  STEPS:
-     1. Plug laptop into AC
+     1. Plug laptop into AC.
  VERIFICATION:
      Was the laptop plugged into AC?
+
+plugin: manual
+name: power-management/reboot_manual
+user:root
+command: shutdown -r now
+_description:
+ PURPOSE:
+     This test will verify that your system can successfully reboot.
+ STEPS:
+     1. Select 'Test' to initiate a system reboot.
+     2. When the grub boot menu is displayed, boot into Ubuntu (Or allow the
+     system to automatically boot on its own).
+     3. Once the system has restarted, log in and restart checkbox-certification-server.
+     4. Select 'Re-Run' to return to this test.
+     5. Select 'Yes' to indicate the test has passed if the system rebooted
+     successfully, otherwise, select 'No' to indicate there was a problem.
+ VERIFICATION:
+     Did the system reboot correctly?
+
+plugin: manual
+name: power-management/shutdown_manual
+user: root
+command: shutdown -h now
+_description:
+ PURPOSE:
+     This test will check your system shutdown/booting cycle
+ STEPS:
+     1. Select 'Test' to initiate a system shutdown.
+     2. Power the system back on.
+     3. From the grub menu, boot into the Xen Hypervisor.
+     4. When the system has restarted, log in and restart checkbox-certification-server.
+     5. Select 'Re-Run' to return to this test.
+     6. Select 'Yes' to indicate the test has passed if the machine shut down
+     successfully otherwise, Select 'No' to indicate there was a problem.
+ VERIFICATION:
+     Did the system shutdown and boot correctly?
 
=== modified file 'jobs/rendercheck.txt.in'
--- jobs/rendercheck.txt.in	2013-02-08 17:02:12 +0000
+++ jobs/rendercheck.txt.in	2013-05-09 20:11:45 +0000
@@ -2,7 +2,7 @@
 name: rendercheck/tests
 requires:
  package.name == 'x11-apps'
-command: ( rendercheck_test -d -o $CHECKBOX_DATA/rendercheck-results && echo "Rendercheck tests completed successfully" ) || ( echo "Error running rendercheck. Please see the log $CHECKBOX_DATA/rendercheck-results for details" >&2 && false )
+command: ( rendercheck_test -b repeat -b gradients -d -o $CHECKBOX_DATA/rendercheck-results && echo "Rendercheck tests completed successfully" ) || ( echo "Error running rendercheck. Please see the log $CHECKBOX_DATA/rendercheck-results for details" >&2 && false )
 _description:
  Runs all of the rendercheck test suites. This test can take a few minutes.
 
 
=== modified file 'jobs/resource.txt.in'
--- jobs/resource.txt.in	2013-02-22 16:26:25 +0000
+++ jobs/resource.txt.in	2013-05-09 20:11:45 +0000
@@ -109,3 +109,16 @@
  for e in `env | sed 's/=/:/g'`; do
      echo $e | awk -F':' '{print $1 ": " $2}'
  done
+
+name: mobilebroadband
+plugin: resource
+description: Create resource for mobile broadband devices
+command:
+ if mm-test --no-scan | grep -q 'GSM modem'
+ then
+    echo "gsm: supported"
+ fi
+ if mm-test --no-scan | grep -q 'CDMA modem'
+ then
+    echo "cdma: supported"
+ fi
 
=== modified file 'jobs/stress.txt.in'
--- jobs/stress.txt.in	2013-01-03 20:46:04 +0000
+++ jobs/stress.txt.in	2013-05-09 20:11:45 +0000
@@ -16,7 +16,7 @@
 command:
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  fwts_test -l $CHECKBOX_DATA/hibernate_30_cycles -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30
+  fwts_test -l $CHECKBOX_DATA/hibernate_30_cycles -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30
  else
   echo "Calling sleep_test"
   sleep_test -s disk -i 30 -w 120
@@ -25,6 +25,12 @@
  PURPOSE:
     This is an automated stress test that will force the system to hibernate/resume for 30 cycles
 
+plugin: shell
+name: power-management/hibernate-30-cycles-log-check
+command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && sleep_test_log_check -v s4 $CHECKBOX_DATA/hibernate_30_cycles.log
+_description:
+ Automated check of the 30 cycle hibernate log for errors detected by fwts.
+
 plugin: attachment
 name: power-management/hibernate-30-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && cat $CHECKBOX_DATA/hibernate_30_cycles.log
@@ -39,7 +45,7 @@
 command: 
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_30_cycles -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
+  set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
  else
   echo "Calling sleep_test"
   set -o pipefail; sleep_test -p s mem -i 30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
@@ -48,6 +54,12 @@
  PURPOSE:
     This is an automated stress test that will force the system to suspend/resume for 30 cycles.
 
+plugin: shell
+name: power-management/suspend-30-cycles-log-check
+command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $CHECKBOX_DATA/suspend_30_cycles.log
+_description:
+ Automated check of the 30 cycle hibernate log for errors detected by fwts.
+
 plugin: attachment
 name: power-management/suspend-30-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && cat $CHECKBOX_DATA/suspend_30_cycles.log
@@ -172,7 +184,7 @@
  package.name == 'x11-apps'
 user: root
 environ: CHECKBOX_DATA
-command: graphics_stress_test -d -o $CHECKBOX_DATA/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $CHECKBOX_DATA/graphics-stress-results for details" && false
+command: graphics_stress_test -b repeat -d -o $CHECKBOX_DATA/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $CHECKBOX_DATA/graphics-stress-results for details" && false
 _description:
  Run the graphics stress test. This test can take a few minutes.
 
 
=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2013-03-07 15:52:02 +0000
+++ jobs/suspend.txt.in	2013-05-09 20:11:45 +0000
@@ -40,7 +40,8 @@
 plugin: shell
 name: suspend/bluetooth_obex_before_suspend
 requires:
- package.name == 'bluez' and package.name == 'obexd-client'
+ package.name == 'bluez'
+ package.name == 'obexd-client'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -65,7 +66,8 @@
 plugin: shell
 name: suspend/bluetooth_obex_send_before_suspend
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -90,7 +92,8 @@
 plugin: shell
 name: suspend/bluetooth_obex_browse_before_suspend
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -115,7 +118,8 @@
 plugin: shell
 name: suspend/bluetooth_obex_get_before_suspend
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -140,7 +144,8 @@
 plugin: manual
 name: suspend/bluetooth_obex_before_suspend_manual
 requires:
- package.name == 'bluez' and package.name == 'obexd-client'
+ package.name == 'bluez'
+ package.name == 'obexd-client'
  device.category == 'BLUETOOTH'
 command: rfkill unblock bluetooth; obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
@@ -163,7 +168,7 @@
 command:
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  set -o pipefail; fwts_test -f critical -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $CHECKBOX_DATA/suspend_single_times.log
+  set -o pipefail; fwts_test -f none -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $CHECKBOX_DATA/suspend_single_times.log
  else
   echo "Calling sleep_test"
   set -o pipefail; sleep_test -p | tee $CHECKBOX_DATA/suspend_single_times.log
@@ -173,10 +178,12 @@
      This test will check suspend and resume
  STEPS:
      1. Click "Test" and your system will suspend for about 30 - 60 seconds
-     2. If your system does not wake itself up after 60 seconds, please press the power button momentarily to wake the system manually
-     3. If your system fails to wake at all and must be rebooted, restart System Testing after reboot and mark this test as Failed
+     2. Observe the Power LED to see if it blinks or changes color during suspend
+     3. If your system does not wake itself up after 60 seconds, please press the power button momentarily to wake the system manually
+     4. If your system fails to wake at all and must be rebooted, restart System Testing after reboot and mark this test as Failed
  VERIFICATION:
      Did your system suspend and resume correctly?
+     (NOTE: Please only consider whether the system successfully suspended and resumed. Power/Suspend LED verification will occur after this test is completed.)
 
 plugin: shell
 name: suspend/suspend_advanced_auto
@@ -187,7 +194,13 @@
  This is the automated version of suspend/suspend_advanced.
 user: root
 environ: CHECKBOX_DATA
-command: set -o pipefail; fwts_test -f critical -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $CHECKBOX_DATA/suspend_single_times.log
+command: set -o pipefail; fwts_test -f none -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $CHECKBOX_DATA/suspend_single_times.log
+
+plugin: shell
+name: suspend/suspend-single-log-check
+command: [ -e $CHECKBOX_DATA/suspend_single.log ] && sleep_test_log_check -v s3 $CHECKBOX_DATA/suspend_single.log
+_description:
+ Automated check of the suspend log to look for errors reported by fwts
 
 plugin: attachment
 name: suspend/suspend-single-log-attach
@@ -254,6 +267,16 @@
  audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend
 
 plugin: shell
+name: suspend/audio_after_suspend_auto
+requires:
+ device.category == 'AUDIO'
+ package.name == 'alsa-base'
+depends: suspend/suspend_advanced_auto suspend/audio_before_suspend
+_description: Verify that mixer settings after suspend are the same as before suspend.
+command:
+ audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend
+
+plugin: shell
 name: suspend/cpu_after_suspend
 depends: suspend/suspend_advanced suspend/cpu_before_suspend
 _description: Verify that all CPUs are online after resuming.
@@ -309,7 +332,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID" EXIT; create_connection $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID" EXIT; create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using WPA
  security and the 802.11b/g protocols after the system has been suspended.
@@ -322,7 +345,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_BG_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_BG_SSID" EXIT; create_connection $OPEN_BG_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_BG_SSID" EXIT; create_connection wifi $OPEN_BG_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using no
  security and the 802.11b/g protocols after the system has been suspended.
@@ -335,7 +358,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_N_SSID WPA_N_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_N_SSID" EXIT; create_connection $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_N_SSID" EXIT; create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using WPA
  security and the 802.11n protocol after the system has been suspended.
@@ -348,7 +371,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_N_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID" EXIT; create_connection $OPEN_N_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID" EXIT; create_connection wifi $OPEN_N_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using no
  security and the 802.11n protocol after the system has been suspended.
@@ -361,7 +384,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID" EXIT; create_connection $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID" EXIT; create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using WPA
  security and the 802.11b/g protocols after the system has been suspended.
@@ -374,7 +397,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_BG_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_BG_SSID" EXIT; create_connection $OPEN_BG_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_BG_SSID" EXIT; create_connection wifi $OPEN_BG_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using no
  security and the 802.11b/g protocols after the system has been suspended.
@@ -387,7 +410,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_N_SSID WPA_N_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_N_SSID" EXIT; create_connection $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_N_SSID" EXIT; create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using WPA
  security and the 802.11n protocol after the system has been suspended.
@@ -400,7 +423,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_N_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID" EXIT; create_connection $OPEN_N_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID" EXIT; create_connection wifi $OPEN_N_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using no
  security and the 802.11n protocol after the system has been suspended.
@@ -413,7 +436,7 @@
  environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID ROUTER_PSK
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  PURPOSE:
      Tests that the systems wireless hardware can connect to a router using WPA
@@ -435,7 +458,7 @@
  environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  PURPOSE:
      Tests that the systems wireless hardware can connect to a router using
@@ -457,7 +480,7 @@
  environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID ROUTER_PSK
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  PURPOSE:
      Tests that the systems wireless hardware can connect to a router using WPA
@@ -479,7 +502,7 @@
  environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  PURPOSE:
      Tests that the systems wireless hardware can connect to a router using
@@ -521,7 +544,8 @@
 name: suspend/bluetooth_obex_after_suspend
 depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend
 requires:
- package.name == 'bluez' and package.name == 'obexd-client'
+ package.name == 'bluez'
+ package.name == 'obexd-client'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -547,7 +571,8 @@
 name: suspend/bluetooth_obex_after_suspend_auto
 depends: suspend/suspend_advanced_auto suspend/bluetooth_obex_before_suspend
 requires:
- package.name == 'bluez' and package.name == 'obexd-client'
+ package.name == 'bluez'
+ package.name == 'obexd-client'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -573,7 +598,8 @@
 name: suspend/bluetooth_obex_send_after_suspend
 depends: suspend/suspend_advanced
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -599,7 +625,8 @@
 name: suspend/bluetooth_obex_send_after_suspend_auto
 depends: suspend/suspend_advanced_auto
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -625,7 +652,8 @@
 name: suspend/bluetooth_obex_browse_after_suspend
 depends: suspend/suspend_advanced
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -651,7 +679,8 @@
 name: suspend/bluetooth_obex_browse_after_suspend_auto
 depends: suspend/suspend_advanced_auto
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -677,7 +706,8 @@
 name: suspend/bluetooth_obex_get_after_suspend
 depends: suspend/suspend_advanced
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -703,7 +733,8 @@
 name: suspend/bluetooth_obex_get_after_suspend_auto
 depends: suspend/suspend_advanced_auto
 requires:
- package.name == 'bluez' and package.name == 'obexftp'
+ package.name == 'bluez'
+ package.name == 'obexftp'
  device.category == 'BLUETOOTH'
 command:
   if [ -z "$BTDEVADDR" ]
@@ -729,7 +760,8 @@
 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'
+ package.name == 'bluez'
+ package.name == 'obexd-client'
  device.category == 'BLUETOOTH'
 command: rfkill unblock bluetooth; obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
@@ -780,6 +812,17 @@
 _description:
  This will check to make sure that your audio device works properly after a suspend and resume.  This may work fine with speakers and onboard microphone, however, it works best if used with a cable connecting the audio-out jack to the audio-in jack.
 
+plugin: shell
+name: suspend/record_playback_after_suspend_auto
+depends: suspend/suspend_advanced_auto
+requires:
+ device.category == 'AUDIO'
+ package.name == 'python-gst0.10'
+ package.name == 'alsa-base'
+command: audio_test
+_description:
+ This will check to make sure that your audio device works properly after a suspend and resume.  This may work fine with speakers and onboard microphone, however, it works best if used with a cable connecting the audio-out jack to the audio-in jack.
+
 plugin: attachment
 name: suspend/suspend-auto-single-log-attach
 command: [ -e $CHECKBOX_DATA/suspend_auto_single_log ] && cat $CHECKBOX_DATA/suspend_auto_single_log
@@ -808,21 +851,17 @@
 plugin: shell
 name: suspend/gpu_lockup_after_suspend
 requires:
- package.name == 'fwts'
  package.name == 'wmctrl'
  package.name == 'mesa-utils'
 depends: suspend/suspend_advanced_auto
-user: root
 command: gpu_test
 _description:
  PURPOSE:
-     Do some challenging operations, suspend the system, do more challenging
-     operations - then check for lockup on the GPU
+     Do some challenging operations then check for lockup on the GPU
  STEPS:
      1. Create 2 glxgears windows and move them quickly
-     2. Switch workspaces/viewports with wmctrl
+     2. Switch workspaces with wmctrl
      3. Launch an HTML5 video playback in firefox
-     4. Suspend/resume
  VERIFICATION:
      After a 60s workload, check kern.log for reported GPU errors
 
@@ -837,6 +876,16 @@
  after a suspend/resume cycle.
 
 plugin: shell
+name: suspend/wifi_resume_time_auto
+depends: suspend/suspend_advanced_auto
+requires:
+   device.category == 'WIRELESS'
+command: network_reconnect_resume_test -t 20 -d wifi
+_description:
+ Checks the length of time it takes to reconnect an existing wifi connection
+ after a suspend/resume cycle.
+
+plugin: shell
 name: suspend/network_resume_time
 depends: suspend/suspend_advanced
 requires:
@@ -846,6 +895,16 @@
  Checks the length of time it takes to reconnect an existing wired connection
   after a suspend/resume cycle.
 
+plugin: shell
+name: suspend/network_resume_time_auto
+depends: suspend/suspend_advanced_auto
+requires:
+   device.category == 'NETWORK'
+command: network_reconnect_resume_test -t 10 -d wired
+_description:
+ Checks the length of time it takes to reconnect an existing wired connection
+  after a suspend/resume cycle.
+
 plugin: manual
 name: suspend/led_after_suspend/power
 depends: suspend/suspend_advanced
@@ -943,10 +1002,8 @@
  STEPS:
      1. Make sure WLAN connection is established
      2. WLAN LED should light
-     3. Select Test to open Firefox
-     4. WLAN LED should flash while downloading data
  VERIFICATION:
-     Did the WLAN LED light and flash as expected after resuming from suspend?
+     Did the WLAN LED light as expected after resuming from suspend?
 
 plugin: manual
 name: suspend/led_after_suspend/wlan-disabled
 
=== modified file 'jobs/usb.txt.in'
--- jobs/usb.txt.in	2012-11-12 15:32:12 +0000
+++ jobs/usb.txt.in	2013-05-09 20:11:45 +0000
@@ -101,7 +101,7 @@
 name: usb/storage-transfer
 depends: usb/insert
 user: root
-command: removable_storage_test usb
+command: removable_storage_test -s 268400000 usb
 _description:
  PURPOSE:
      This test will check your USB connection.
@@ -119,7 +119,7 @@
  usb.usb3 == 'supported'
 depends: usb3/insert
 user: root
-command: removable_storage_test -m 500000000 -p 7 usb
+command: removable_storage_test -s 268400000 -m 500000000 -p 7 usb
 _description:
  PURPOSE:
      This test will check your USB 3.0 connection.
@@ -135,7 +135,7 @@
 name: usb/storage-automated
 depends: usb/insert
 user: root
-command: removable_storage_test usb
+command: removable_storage_test -s 268400000 usb
 _description:
  This test is automated and executes after the usb/insert test is run.
 
@@ -145,14 +145,14 @@
  usb.usb3 == 'supported'
 depends: usb3/insert
 user: root
-command: removable_storage_test -m 500000000 -p 7 usb
+command: removable_storage_test -s 268400000 -m 500000000 -p 7 usb
 _description:
  This test is automated and executes after the usb3/insert test is run.
 
 plugin: shell
 name: usb/storage-preinserted
 user: root
-command: removable_storage_test -l usb && removable_storage_test usb
+command: removable_storage_test -l usb && removable_storage_test -s 268400000 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
@@ -163,7 +163,7 @@
 user: root
 requires:
  usb.usb3 == 'supported'
-command: removable_storage_test -l usb && removable_storage_test -m 500000000 -p 7 usb
+command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 -p 7 usb
 _description:
  This is an automated version of usb3/storage-automated and assumes that the
  server has usb 3.0 storage devices plugged in prior to checkbox execution. It
 
=== modified file 'jobs/virtualization.txt.in'
--- jobs/virtualization.txt.in	2013-02-08 17:02:12 +0000
+++ jobs/virtualization.txt.in	2013-05-09 20:11:45 +0000
@@ -22,3 +22,19 @@
 command: virtualization kvm --debug
 _description:
  Test to check that a cloud image boots and works properly with KVM
+
+plugin: shell
+name: virtualization/xen_ok
+requires: package.name == 'libvirt-bin'
+user: root
+command: virsh -c xen:/// domstate Domain-0
+_description:
+ Test to verify that the Xen Hypervisor is running.
+
+plugin: shell
+name: virtualization/xen_check_vm
+depends: virtualization/xen_ok
+user: root
+command: xen_test /images/xentest.img /images/xentest.xml
+_description:
+ Test to check that a Xen domU image can boot and run on Xen on Ubuntu
 
=== modified file 'jobs/wireless.txt.in'
--- jobs/wireless.txt.in	2012-10-16 20:45:22 +0000
+++ jobs/wireless.txt.in	2013-05-09 20:11:45 +0000
@@ -40,7 +40,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK
-command: trap "nmcli con delete id $WPA_BG_SSID" EXIT; create_connection $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $WPA_BG_SSID" EXIT; create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using WPA
  security and the 802.11b/g protocols.
@@ -52,7 +52,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_BG_SSID
-command: trap "nmcli con delete id $OPEN_BG_SSID" EXIT; create_connection $OPEN_BG_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $OPEN_BG_SSID" EXIT; create_connection wifi $OPEN_BG_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using no
  security and the 802.11b/g protocols.
@@ -64,7 +64,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_N_SSID WPA_N_PSK
-command: trap "nmcli con delete id $WPA_N_SSID" EXIT; create_connection $WPA_N_SSID --security=wpa --key=$WPA_N_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $WPA_N_SSID" EXIT; create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using WPA
  security and the 802.11n protocol.
@@ -76,7 +76,7 @@
  environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_N_SSID
-command: trap "nmcli con delete id $OPEN_N_SSID" EXIT; create_connection $OPEN_N_SSID &&  internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $OPEN_N_SSID" EXIT; create_connection wifi $OPEN_N_SSID &&  internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  Tests that the systems wireless hardware can connect to a router using no
  security and the 802.11n protocol.
@@ -88,7 +88,7 @@
  environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID ROUTER_PSK
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  PURPOSE:
      Tests that the systems wireless hardware can connect to a router using WPA
@@ -109,7 +109,7 @@
  environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  PURPOSE:
      Tests that the systems wireless hardware can connect to a router using
@@ -130,7 +130,7 @@
  environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID ROUTER_PSK
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  PURPOSE:
      Tests that the systems wireless hardware can connect to a router using WPA
@@ -151,7 +151,7 @@
  environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
  PURPOSE:
      Tests that the systems wireless hardware can connect to a router using
@@ -172,7 +172,7 @@
  device.category == 'WIRELESS'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK SERVER_IPERF
-command: trap "nmcli con delete id $WPA_BG_SSID" EXIT; create_connection $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK && iperf -c $SERVER_IPERF -t 300 -i 30
+command: trap "nmcli con delete id $WPA_BG_SSID" EXIT; create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK && iperf -c $SERVER_IPERF -t 300 -i 30
 _description:
  Tests the performance of a systems wireless connection through the iperf tool.
 
@@ -183,7 +183,7 @@
  device.category == 'WIRELESS'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK SERVER_IPERF
-command: trap "nmcli con delete id $WPA_BG_SSID" EXIT; create_connection $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK && iperf -c $SERVER_IPERF -t 300 -i 30 -u -b 100m -p 5050
+command: trap "nmcli con delete id $WPA_BG_SSID" EXIT; create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK && iperf -c $SERVER_IPERF -t 300 -i 30 -u -b 100m -p 5050
 _description:
  Tests the performance of a systems wireless connection through the iperf tool, using UDP packets.
 
@@ -192,7 +192,7 @@
 requires: device.category == 'WIRELESS'
 user: root
 environ: OPEN_A_SSID
-command: trap "nmcli con delete id $OPEN_A_SSID" EXIT; create_connection $OPEN_A_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $OPEN_A_SSID" EXIT; create_connection wifi $OPEN_A_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
   Test that the system's wireless hardware can connect to a router using the
   802.11a protocol. This requires that you have a router pre-configured to only
@@ -203,7 +203,7 @@
 requires: device.category == 'WIRELESS'
 user: root
 environ: OPEN_B_SSID
-command: trap "nmcli con delete id $OPEN_B_SSID" EXIT; create_connection $OPEN_B_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $OPEN_B_SSID" EXIT; create_connection wifi $OPEN_B_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
   Test that the system's wireless hardware can connect to a router using the
   802.11b protocol. This requires that you have a router pre-configured to only
@@ -214,7 +214,7 @@
 requires: device.category == 'WIRELESS'
 user: root
 environ: OPEN_G_SSID
-command: trap "nmcli con delete id $OPEN_G_SSID" EXIT; create_connection $OPEN_G_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command: trap "nmcli con delete id $OPEN_G_SSID" EXIT; create_connection wifi $OPEN_G_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
 _description:
   Test that the system's wireless hardware can connect to a router using the
   802.11g protocol. This requires that you have a router pre-configured to only
 
=== modified file 'plainbox/.coveragerc'
--- plainbox/.coveragerc	2012-12-03 16:15:23 +0000
+++ plainbox/.coveragerc	2013-05-09 20:11:45 +0000
@@ -1,6 +1,17 @@
 [run]
 branch = True
 source = plainbox
+omit =
+    plainbox/tests.py
+    plainbox/vendor/*
+    plainbox/test_*
+    plainbox/impl/test_*
+    plainbox/impl/integration_tests.py
+    plainbox/impl/commands/test_*
+    plainbox/impl/exporter/test_*
+    plainbox/impl/transport/test_*
+    plainbox/impl/secure/test_*
+    plainbox/testing_utils/test_*
 
 [report]
 exclude_lines =
 
=== modified file 'plainbox/MANIFEST.in'
--- plainbox/MANIFEST.in	2012-12-03 16:15:23 +0000
+++ plainbox/MANIFEST.in	2013-05-09 20:11:45 +0000
@@ -1,3 +1,8 @@
 include README.md
 include COPYING
 include mk-interesting-graphs.sh
+recursive-include plainbox/test-data/ *.json *.xml *.txt
+recursive-include docs *.rst
+include docs/conf.py
+include plainbox/data/report/hardware-1_0.rng
+include plainbox/data/org.freedesktop.policykit.pkexec.policy
 
=== removed file 'plainbox/README.md'
--- plainbox/README.md	2013-02-22 16:26:25 +0000
+++ plainbox/README.md	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-plainbox
-========
-
-plainbox is a plain replacement for checkbox
-
-[![Build Status](https://travis-ci.org/zyga/plainbox.png)](https://travis-ci.org/zyga/checkbox)
-
-
-Hacking
-=======
-
-To start hacking use virtualenv with python3. Three steps:
-
-
-1. First install a couple of packages:
-
-    $ sudo apt-get install python-virtualenv python3-dev
-
-2. Then set up the virtualenv. A convenience script is provided to do this for
-   you:
-
-    $ ./mk-venv.sh /path/to/venv
-
-This will create a virtualenv under /tmp/venv and show the command to activate
-it.
-
-You can also set this up manually:
-
-    $ virtualenv -p python3 /path/to/venv
-
-If you do the manual setup and you're on  Ubuntu, you'll need to update the
-version of distribute that is installed inside the virtualenv to install
-coverage. If you used the convenience script, it takes care of this part for
-you.
-
-    (venv) $ easy_install -U distribute
-    (venv) $ easy_install -U coverage
-
-3. Once your virtualenv is set up, you need to activate it:
-
-    $ . /path/to/venv/bin/activate
-
-
-Then 'develop' the package, this will setup proper path imports and create stub
-executables for you. All imports will now use your directory (no need to set
-PYTHONPATH to anything)
-
-    (venv) $ python3 setup.py develop
-
-You will be now able to run plainbox:
-
-    (venv) $ plainbox --help
-
-Testing
-=======
-
-When hacking, run tests with code coverage (peek at .coveragerc):
-
-    (venv) $ coverage run setup.py test
-
-You can also use the standard 'discover' command from python3 unittest module:
-
-    (venv) $ coverage run -m unittest discover
-
-...then look at test report coverage in the console:
-
-    (venv) $ coverage report
-
-...or in your browser:
-
-    (venv) $ coverage html
-    (venv) $ xdg-open htmlcov/index.html
-
-Using the checkbox submodule
-============================
-
-This git tree uses the submodule system to put the entire checkbox source code
-repository in the checkbox directory. To use it, after you get the plainbox
-tree run the following commands:
-
-    $ git submodule init
-    $ git submodule update
-
-You only need to run init once, and update each time the chcekbox submodule is
-updated to point to new commit in the checkbox tree. If you use this all of
-plainbox tests and actual code will run using the embedded copy of checkbox. If
-you don't do this you need to install checkbox globally using a system package.
-
-VirtualEnv and checkbox Jobs
-============================
-
-When using checkbox inside virtualenv some jobs will fail as they need access
-to system python libraries (most notably for dbus). checkbox jobs don't rewrite
-their scripts shebang lines so when installed from the system package it will
-fail inside a typical virtualenv. This will be addressed in the next release.
-
-To work around it, temporarily, you can install plainbox without virtualbox and
-use it as is. This will work correctly (use the package from
-ppa:checkbox-dev/ppa if possible)
-
-Known Issues
-============
-
-There are a few issues that we are currently aware of:
-
-1) Expressions are not evaluated the same way as they were in checkbox. This
-affects only a few jobs and will be corrected in the next release. Most likely
-we will adapt jobs to follow plainbox logic and leave the checkbox interpreter
-as is as plainbox is less surprising and actually fixes one important bug where
-an expression like:
-
-    package.name == "foo" and package.version == "1.0"
-
-When executed inside checkbox it would match (evaluate as true) when the
-package "foo" existed and any _other_ package with version 1.0 existed, thus
-making the test worthless. In plainbox this test behaves as expected but it is
-non the less not doing what checkbox did so it causes some problems.
-
-2) Many job types are still not supported. The only supported jobs are: shell, resource,
-local and manual
-
-3) Jobs that use the environ and user keys are not supported. Those keys are ignored
 
=== added file 'plainbox/README.rst'
--- plainbox/README.rst	1970-01-01 00:00:00 +0000
+++ plainbox/README.rst	2013-05-09 20:11:45 +0000
@@ -0,0 +1,23 @@
+PlainBox
+========
+
+PlainBox is a hardware testing tool useful for certifying laptops, desktops and
+servers with Ubuntu. It is a replacement for the current certification tool,
+CheckBox.
+
+PlainBox complements CheckBox. It uses all the hardware test definitions,
+scripts and libraries from CheckBox. PlainBox is currently in alpha stages,
+having mostly but not entirely complete core and a developer-centric command
+line interface.
+
+External Documentation Links
+============================
+
+* `Using PlainBox <http://pythonhosted.org/plainbox/usage.html>`_
+* `Hacking on PlainBox <http://pythonhosted.org/plainbox/dev/intro.html>`_
+* `Testing PlainBox <http://pythonhosted.org/plainbox/dev/intro.html#running-plainbox-tests>`_
+
+Known Issues
+============
+
+`List of bugs tagged with 'plainbox' on lp:checkbox <https://bugs.launchpad.net/checkbox/+bugs?field.searchtext=&orderby=-importance&field.status%3Alist=NEW&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=FIXCOMMITTED&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&assignee_option=any&field.assignee=&field.bug_reporter=&field.bug_commenter=&field.subscriber=&field.structural_subscriber=&field.tag=plainbox&field.tags_combinator=ANY&field.has_cve.used=&field.omit_dupes.used=&field.omit_dupes=on&field.affects_me.used=&field.has_patch.used=&field.has_branches.used=&field.has_branches=on&field.has_no_branches.used=&field.has_no_branches=on&field.has_blueprints.used=&field.has_blueprints=on&field.has_no_blueprints.used=&field.has_no_blueprints=on&search=Search>`_
 
=== added file 'plainbox/Vagrantfile'
--- plainbox/Vagrantfile	1970-01-01 00:00:00 +0000
+++ plainbox/Vagrantfile	2013-05-09 20:11:45 +0000
@@ -0,0 +1,42 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby sw=2 ts=2 :
+
+Vagrant::Config.run do |config|
+
+  config.ssh.timeout = 60
+
+  # Define a Ubuntu Server image (cloud) for the 12.04 release (precise)
+  config.vm.define :precise do |precise_config|
+    precise_config.vm.box = "precise-cloud-i386"
+    precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 12.10 release (quantal)
+  config.vm.define :quantal do |quantal_config|
+    quantal_config.vm.box = "quantal-cloud-i386"
+    quantal_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 13.04 release (raring)
+  config.vm.define :raring do |raring_config|
+    raring_config.vm.box = "raring-cloud-i386"
+    raring_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # For debugging and later future GUI testing
+  if ENV.key? "VAGRANT_GUI"
+    config.vm.boot_mode = :gui
+  end
+
+  # Setup an apt cache if one is available
+  if ENV.key? "VAGRANT_APT_CACHE"
+    config.vm.provision :shell, :inline => "echo 'Acquire::http { Proxy \"#{ENV['VAGRANT_APT_CACHE']}\"; };' > /etc/apt/apt.conf"
+  end
+
+  # Update to have the latest packages, this is needed because the image comes
+  # with an old (and no longer working) apt cache and links to many packages no
+  # longer work.
+  config.vm.provision :shell, :inline => "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade --yes"
+  # Create a cool symlink so that everyone knows where to go to
+  config.vm.provision :shell, :inline => "ln --no-dereference --force --symbolic /vagrant /home/vagrant/plainbox"
+end
 
=== added directory 'plainbox/daily-package-testing'
=== added file 'plainbox/daily-package-testing/README'
--- plainbox/daily-package-testing/README	1970-01-01 00:00:00 +0000
+++ plainbox/daily-package-testing/README	2013-05-09 20:11:45 +0000
@@ -0,0 +1,18 @@
+About
+=====
+
+This Vagrantfile can be used to see how packaged version of plainbox from the
+ppa looks like.
+
+The package is built with this recipe:
+https://code.launchpad.net/~checkbox-dev/+recipe/plainbox-daily
+
+Usage instructions
+==================
+
+$TARGET is either precise or quantal
+
+$ vagrant up $TARGET
+$ vagrant ssh $TARGET
+$ plainbox --help
+$ exit
 
=== added file 'plainbox/daily-package-testing/Vagrantfile'
--- plainbox/daily-package-testing/Vagrantfile	1970-01-01 00:00:00 +0000
+++ plainbox/daily-package-testing/Vagrantfile	2013-05-09 20:11:45 +0000
@@ -0,0 +1,48 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby sw=2 ts=2 :
+
+Vagrant::Config.run do |config|
+
+  config.ssh.timeout = 60
+
+  # Define a Ubuntu Server image (cloud) for the 12.04 release (precise)
+  config.vm.define :precise do |precise_config|
+    precise_config.vm.box = "precise-cloud-i386"
+    precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 12.10 release (quantal)
+  config.vm.define :quantal do |quantal_config|
+    quantal_config.vm.box = "quantal-cloud-i386"
+    quantal_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 13.04 release (raring)
+  config.vm.define :raring do |raring_config|
+    raring_config.vm.box = "raring-cloud-i386"
+    raring_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # For debugging and later future GUI testing
+  if ENV.key? "VAGRANT_GUI"
+    config.vm.boot_mode = :gui
+  end
+
+  # Setup an apt cache if one is available
+  if ENV.key? "VAGRANT_APT_CACHE"
+    config.vm.provision :shell, :inline => "echo 'Acquire::http { Proxy \"#{ENV['VAGRANT_APT_CACHE']}\"; };' > /etc/apt/apt.conf"
+  end
+
+  # Update to have the latest packages, this is needed because the image comes
+  # with an old (and no longer working) apt cache and links to many packages no
+  # longer work.
+  config.vm.provision :shell, :inline => "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade --yes"
+  # Install package that provides add-apt-repository 
+  config.vm.provision :shell, :inline => "apt-get install --yes python-software-properties"
+  # Add the checkbox-dev/ppa ppa with daily builds 
+  config.vm.provision :shell, :inline => "add-apt-repository ppa:checkbox-dev/ppa"
+  # Update apt cache again
+  config.vm.provision :shell, :inline => "apt-get update"
+  # Install plainbox