Merge lp:~roadmr/ubuntu/oneiric/checkbox/0.13 into lp:ubuntu/oneiric/checkbox

[Daniel Manrique]

[Sebastien Bacher (seb128)]

Thank you for your work, I'm sponsoring it to precise but I can't set the merge request to merged since you targetted oneiric which is the wrong serie and launchpad will not let me edit it, could you do that?

Unmerged revisions

36. By Daniel Manrique on 2011-11-18

New upstream release (LP: #892268):
* Generate a submission.xml file that contains all device and attachment
* Write the report before reporting the validation error.
* Changed device.product to dmi.product for the formfactor (LP: #875312)
* Use gettext for string (LP: #869267)
* Move progress indicator to main checkbox dialog instead of a
  transient window (LP: #868995)
* Ignore malformed dpkg entries in package_resource (LP: #794747)
* Reset window title after finishing a manual test (LP: #874690)
* Handle "@" in locale names (as in ca@valencia).
* Went through all the job files and:
  * Updated descriptions to match Unity UI structure
  * Added descriptions where necessary
  * Added further details to some descriptions
  * Moved some jobs to more appropriate files
  * Fixed job names in older job files to match new naming scheme
    (suite/testname)
  * Added jobs to local.txt to ensure all job files are now parsed
    (this allows easier addition of existing tests to whitelists)
  * Changed remaining manual job descriptions to match the new format
* Updated CD and DVD write tests to be more clear about when to skip
  them (LP: #772794)
* Rewrote all job descriptions to match OEM QA syntax
* Fix the code that assigns keys in checkbox-cli so that it never assigns
  keys which have other uses. (LP: #877467)
* Show details of unmet job requirements (LP: #855852)
* Ensure that connect_wireless chooses a wireless connection from the list
  of available connections (LP: #877752)
* Have the bluetooth/detect tests require a device with the category
  BLUETOOTH to run, thus preventing the test from failing on systems with
  no Bluetooth device (LP: #862322)
* Rename attachment jobs to not have a forward slash in their name
  (LP: #887964)
* Guard against trying to write files to logical partitions on USB sticks
  (which will obviously fail) in usb_test (LP: #887049)
* Make the OpenGL test ignore the return value of glxgears and improve
  the test description (LP: #890725)
* Allow input/mouse test to run if a TOUCH device is present
  (LP: #886129)
* Broken job dependencies fixed (LP: #888447)
* Regex support when specifying blacklists and whitelists on the
  commandline (LP: #588647)

=== modified file 'checkbox/application.py'
--- checkbox/application.py	2011-02-14 18:19:27 +0000
+++ checkbox/application.py	2011-11-18 18:04:27 +0000
@@ -81,13 +81,13 @@
                           default=[],
                           help=_("Configuration override parameters."))
         parser.add_option("-b", "--blacklist",
-                          help=_("Shorthand for --config=checkbox/plugins/jobs_info/blacklist."))
+                          help=_("Shorthand for --config=.*/jobs_info/blacklist."))
         parser.add_option("-B", "--blacklist-file",
-                          help=_("Shorthand for --config=checkbox/plugins/jobs_info/blacklist_file."))
+                          help=_("Shorthand for --config=.*/jobs_info/blacklist_file."))
         parser.add_option("-w", "--whitelist",
-                          help=_("Shorthand for --config=checkbox/plugins/jobs_info/whitelist."))
+                          help=_("Shorthand for --config=.*/jobs_info/whitelist."))
         parser.add_option("-W", "--whitelist-file",
-                          help=_("Shorthand for --config=checkbox/plugins/jobs_info/whitelist_file."))
+                          help=_("Shorthand for --config=.*/jobs_info/whitelist_file."))
         return parser.parse_args(args)
 
     def create_application(self, args=sys.argv):
@@ -102,7 +102,7 @@
 
         # Replace shorthands
         for shorthand in "blacklist", "blacklist_file", "whitelist", "whitelist_file":
-            key = "checkbox/plugins/jobs_info/%s" % shorthand
+            key = ".*/jobs_info/%s" % shorthand
             value = getattr(options, shorthand)
             if value:
                 options.config.append("=".join([key, value]))
 
=== modified file 'checkbox/contrib/persist.py'
--- checkbox/contrib/persist.py	2011-02-14 18:19:27 +0000
+++ checkbox/contrib/persist.py	2011-11-18 18:04:27 +0000
@@ -23,6 +23,7 @@
 import re
 import posixpath
 
+from checkbox.lib.safe import safe_close
 
 __all__ = ["Persist", "MemoryBackend", "PickleBackend", "BPickleBackend",
     "path_string_to_tuple", "path_tuple_to_string", "RootedPersist",
@@ -517,14 +518,14 @@
         try:
             return self._pickle.load(file)
         finally:
-            file.close()
+            safe_close(file)
 
     def save(self, filepath, map):
         file = open(filepath, "w")
         try:
             self._pickle.dump(map, file, 2)
         finally:
-            file.close()
+            safe_close(file)
 
 
 class BPickleBackend(Backend):
@@ -538,11 +539,11 @@
         try:
             return self._bpickle.loads(file.read())
         finally:
-            file.close()
+            safe_close(file)
 
     def save(self, filepath, map):
         file = open(filepath, "w")
         try:
             file.write(self._bpickle.dumps(map))
         finally:
-            file.close()
+            safe_close(file)
 
=== added file 'checkbox/dispatcher.py'
--- checkbox/dispatcher.py	1970-01-01 00:00:00 +0000
+++ checkbox/dispatcher.py	2011-11-18 18:04:27 +0000
@@ -0,0 +1,201 @@
+# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+__all__ = [
+    "Dispatcher",
+    "DispatcherList",
+    "DispatcherQueue",
+    ]
+
+import logging
+
+from itertools import product
+
+
+class Event:
+    """Event payload containing the positional and keywoard arguments
+    passed to the handler in the event listener."""
+
+    def __init__(self, type, *args, **kwargs):
+        self.type = type
+        self.args = args
+        self.kwargs = kwargs
+
+
+class Listener:
+    """Event listener notified when events are published by the dispatcher."""
+
+    def __init__(self, event_type, handler, count):
+        self.event_type = event_type
+        self.handler = handler
+        self.count = count
+
+    def notify(self, event):
+        """Notify the handler with the payload of the event.
+
+        :param event: The event containint the payload for the handler.
+        """
+        if self.count is None or self.count:
+            self.handler(*event.args, **event.kwargs)
+            if self.count:
+                self.count -= 1
+
+
+class ListenerList(Listener):
+    """Event listener notified for lists of events."""
+
+    def __init__(self, *args, **kwargs):
+        super(ListenerList, self).__init__(*args, **kwargs)
+        self.event_types = set(self.event_type)
+        self.kwargs = {}
+
+    def notify(self, event):
+        """Only notify the handler when all the events for this listener
+        have been published by the dispatcher. When duplicate events
+        occur, the latest event is preserved and the previous one are
+        overwritten until all events have been published.
+        """
+        if self.count is None or self.count:
+            self.kwargs[event.type] = event.args[0]
+            if self.event_types.issubset(self.kwargs):
+                self.handler(**self.kwargs)
+                if self.count:
+                    self.count -= 1
+
+
+class ListenerQueue(ListenerList):
+
+    def notify(self, event):
+        """Only notify the handler when all the events for this listener
+        have been published by the dispatcher. Duplicate events are enqueued
+        and dequeued only when all events have been published.
+        """
+        arg = event.args[0]
+        queue = self.kwargs.setdefault(event.type, [])
+
+        # Strip duplicates from the queue.
+        if arg not in queue:
+            queue.append(arg)
+
+        # Once the queue has handler has been called, the queue
+        # then behaves like a list using the latest events.
+        if self.event_types.issubset(self.kwargs):
+            self.notify = notify = super(ListenerQueue, self).notify
+            keys = self.kwargs.keys()
+            for values in product(*self.kwargs.values()):
+                self.kwargs = dict(zip(keys, values))
+                notify(event)
+
+
+class Dispatcher:
+    """Register handlers and publish events for them identified by strings."""
+
+    listener_factory = Listener
+
+    def __init__(self, listener_factory=None):
+        self._event_listeners = {}
+
+        if listener_factory is not None:
+            self.listener_factory = listener_factory
+
+    def registerHandler(self, event_type, handler, count=None):
+        """Register an event handler and return its listener.
+
+        :param event_type: The name of the event type to handle.
+        :param handler: The function handling the given event type.
+        :param count: Optionally, the number times to call the handler.
+        """
+        listener = self.listener_factory(event_type, handler, count)
+
+        listeners = self._event_listeners.setdefault(event_type, [])
+        listeners.append(listener)
+
+        return listener
+
+    def unregisterHandler(self, handler):
+        """Unregister a handler.
+
+        :param handler: The handler to unregister.
+        """
+        for event_type, listeners in self._event_listeners.items():
+            listeners = [
+                listener for listener in listeners
+                if listener.handler == handler]
+            if listeners:
+                self._event_listeners[event_type] = listeners
+            else:
+                del self._event_listeners[event_type]
+
+    def unregisterListener(self, listener, event_type=None):
+        """Unregister a listener.
+
+        :param listener: The listener of the handler to unregister.
+        :param event_type: Optionally, the event_type to unregister.
+        """
+        if event_type is None:
+            event_type = listener.event_type
+
+        self._event_listeners[event_type].remove(listener)
+        if not self._event_listeners[event_type]:
+            del self._event_listeners[event_type]
+
+    def publishEvent(self, event_type, *args, **kwargs):
+        """Publish an event of a given type and notify all listeners.
+
+        :param event_type: The name of the event type to publish.
+        :param args: Positional arguments to pass to the registered handlers.
+        :param kwargs: Keyword arguments to pass to the registered handlers.
+        """
+        if event_type in self._event_listeners:
+            event = Event(event_type, *args, **kwargs)
+            for listener in list(self._event_listeners[event_type]):
+                try:
+                    listener.notify(event)
+                    if listener.count is not None and not listener.count:
+                        self.unregisterListener(listener)
+                except:
+                    logging.exception(
+                        "Error running event handler for %r with args %r %r",
+                        event_type, args, kwargs)
+
+
+class DispatcherList(Dispatcher):
+    """
+    Register handlers and publish events for them identified by lists
+    of strings.
+    """
+
+    listener_factory = ListenerList
+
+    def registerHandler(self, event_types, handler, count=None):
+        """See Dispatcher."""
+        if not isinstance(event_types, (list, tuple,)):
+            event_types = (event_types,)
+
+        listener = self.listener_factory(event_types, handler, count)
+        for event_type in event_types:
+            listeners = self._event_listeners.setdefault(event_type, [])
+            listeners.append(listener)
+
+        return listener
+
+    def unregisterListener(self, listener):
+        """See Dispatcher."""
+        for event_type in listener.event_types:
+            super(DispatcherList, self).unregisterListener(
+                listener, event_type)
+
+    def publishEvent(self, event_type, arg):
+        """See Dispatcher."""
+        super(DispatcherList, self).publishEvent(event_type, arg)
+
+
+class DispatcherQueue(DispatcherList):
+    """
+    Register handlers and publish events for them identified by lists
+    of strings in queue order.
+    """
+
+    listener_factory = ListenerQueue
 
=== modified file 'checkbox/lib/bit.py'
--- checkbox/lib/bit.py	2011-02-14 18:19:27 +0000
+++ checkbox/lib/bit.py	2011-11-18 18:04:27 +0000
@@ -36,10 +36,11 @@
 
     return bitcount
 
-def test_bit(bit, bitmask):
-    bits_per_long = calcsize("l") * 8
-    offset = bit % bits_per_long
-    long = int(bit / bits_per_long)
+def test_bit(bit, bitmask, bits=None):
+    if bits is None:
+        bits = calcsize("l") * 8
+    offset = bit % bits
+    long = int(bit / bits)
     if long >= len(bitmask):
         return 0
     return (bitmask[long] >> offset) & 1
 
=== modified file 'checkbox/lib/config.py'
--- checkbox/lib/config.py	2011-07-01 11:37:27 +0000
+++ checkbox/lib/config.py	2011-11-18 18:04:27 +0000
@@ -122,10 +122,23 @@
                 raise Exception, "Invalid config string: %s" % config
 
             (name, option, value) = match.groups()
-            if not self._parser.has_section(name):
+
+            # Match section names
+            name_regex = re.compile(name)
+            sections = [section for section in self._parser.sections()
+                        if name_regex.match(section)]
+
+            if not sections:
                 self._parser.add_section(name)
+                sections.append(name)
 
-            self._parser.set(name, option, value)
+            for section in sections:
+                logging.debug('Setting configuration parameter: '
+                              '%(section)s/%(option)s = %(value)s'
+                              % {'section': section,
+                                 'option': option,
+                                 'value': value})
+                self._parser.set(section, option, value)
 
     def read_file(self, file, filename="<stream>"):
         logging.info("Reading configurations from: %s", filename)
 
=== modified file 'checkbox/lib/conversion.py'
--- checkbox/lib/conversion.py	2009-01-20 18:55:20 +0000
+++ checkbox/lib/conversion.py	2011-11-18 18:04:27 +0000
@@ -18,48 +18,110 @@
 #
 import re
 
-
-def string_to_type(value):
-    conversion_table = (
-        ("(yes|true)", lambda v: True),
-        ("(no|false)", lambda v: False),
-        ("\d+", lambda v: int(v.group(0))),
-        ("\d+\.\d+", lambda v: float(v.group(0))),
-        ("(\d+) ?([kmgt]?b?)", lambda v: int(v.group(1))),
-        ("(\d+\.\d+) ?([kmgt]?b?)", lambda v: float(v.group(1))),
-        ("(\d+) ?([kmgt]?hz?)", lambda v: int(v.group(1))),
-        ("(\d+\.\d+) ?([kmgt]?hz?)", lambda v: float(v.group(1))))
-
-    multiplier_table = (
-        ("b", 1),
-        ("kb?", 1024),
-        ("mb?", 1024 * 1024),
-        ("gb?", 1024 * 1024 * 1024),
-        ("tb?", 1024 * 1024 * 1024 * 1024),
-        ("hz", 1),
-        ("khz?", 1024),
-        ("mhz?", 1024 * 1024),
-        ("ghz?", 1024 * 1024 * 1024),
-        ("thz?", 1024 * 1024 * 1024 * 1024))
-
-    if isinstance(value, basestring):
-        for regex, conversion in conversion_table:
-            match = re.match("^%s$" % regex, value, re.IGNORECASE)
-            if match:
-                value = conversion(match)
-                if len(match.groups()) < 2:
-                    return value
-
-                unit = match.group(2)
-                for regex, multiplier in multiplier_table:
-                    match = re.match("^%s$" % regex, unit, re.IGNORECASE)
-                    if match:
-                        value *= multiplier
-                        return value
-                else:
-                    raise Exception, "Unknown multiplier: %s" % unit
-
-    return value
+from dateutil import tz
+from datetime import (
+    datetime,
+    timedelta,
+    )
+
+
+DATETIME_RE = re.compile(r"""
+    ^(?P<year>\d\d\d\d)-?(?P<month>\d\d)-?(?P<day>\d\d)
+    T(?P<hour>\d\d):?(?P<minute>\d\d):?(?P<second>\d\d)
+    (?:\.(?P<second_fraction>\d{0,6}))?
+    (?P<tz>
+        (?:(?P<tz_sign>[-+])(?P<tz_hour>\d\d):(?P<tz_minute>\d\d))
+        | Z)?$
+    """, re.VERBOSE)
+
+TYPE_FORMATS = (
+    (r"(yes|true)", lambda v: True),
+    (r"(no|false)", lambda v: False),
+    (r"-?\d+", lambda v: int(v.group(0))),
+    (r"-?\d+\.\d+", lambda v: float(v.group(0))),
+    (r"(-?\d+) ?([kmgt]?b?)", lambda v: int(v.group(1))),
+    (r"(-?\d+\.\d+) ?([kmgt]?b?)", lambda v: float(v.group(1))),
+    (r"(-?\d+) ?([kmgt]?hz)", lambda v: int(v.group(1))),
+    (r"(-?\d+\.\d+) ?([kmgt]?hz)", lambda v: float(v.group(1))))
+TYPE_FORMATS = tuple(
+    (re.compile(r"^%s$" % pattern, re.IGNORECASE), format)
+    for pattern, format in TYPE_FORMATS)
+
+TYPE_MULTIPLIERS = (
+    (r"b", 1),
+    (r"kb?", 1024),
+    (r"mb?", 1024 * 1024),
+    (r"gb?", 1024 * 1024 * 1024),
+    (r"tb?", 1024 * 1024 * 1024 * 1024),
+    (r"hz", 1),
+    (r"khz?", 1024),
+    (r"mhz?", 1024 * 1024),
+    (r"ghz?", 1024 * 1024 * 1024),
+    (r"thz?", 1024 * 1024 * 1024 * 1024))
+TYPE_MULTIPLIERS = tuple(
+    (re.compile(r"^%s$" % pattern, re.IGNORECASE), multiplier)
+    for pattern, multiplier in TYPE_MULTIPLIERS)
+
+
+def datetime_to_string(dt):
+    """Return a consistent string representation for a given datetime.
+
+    :param dt: The datetime object.
+    """
+    return dt.isoformat()
+
+def string_to_datetime(string):
+    """Return a datetime object from a consistent string representation.
+
+    :param string: The string representation.
+    """
+    # we cannot use time.strptime: this function accepts neither fractions
+    # of a second nor a time zone given e.g. as '+02:30'.
+    match = DATETIME_RE.match(string)
+
+    # The Relax NG schema allows a leading minus sign and year numbers
+    # with more than four digits, which are not "covered" by _time_regex.
+    if not match:
+        raise ValueError("Datetime with unreasonable value: %s" % string)
+
+    time_parts = match.groupdict()
+
+    year = int(time_parts['year'])
+    month = int(time_parts['month'])
+    day = int(time_parts['day'])
+    hour = int(time_parts['hour'])
+    minute = int(time_parts['minute'])
+    second = int(time_parts['second'])
+    second_fraction = time_parts['second_fraction']
+    if second_fraction is not None:
+        milliseconds = second_fraction + '0' * (6 - len(second_fraction))
+        milliseconds = int(milliseconds)
+    else:
+        milliseconds = 0
+
+    # The Relax NG validator accepts leap seconds, but the datetime
+    # constructor rejects them. The time values submitted by the HWDB
+    # client are not necessarily very precise, hence we can round down
+    # to 59.999999 seconds without losing any real precision.
+    if second > 59:
+        second = 59
+        milliseconds = 999999
+
+    dt = datetime(
+        year, month, day, hour, minute, second, milliseconds,
+        tzinfo=tz.tzutc())
+
+    tz_sign = time_parts['tz_sign']
+    tz_hour = time_parts['tz_hour']
+    tz_minute = time_parts['tz_minute']
+    if tz_sign in ('-', '+'):
+        delta = timedelta(hours=int(tz_hour), minutes=int(tz_minute))
+        if tz_sign == '-':
+            dt = dt + delta
+        else:
+            dt = dt - delta
+
+    return dt
 
 def sizeof_bytes(bytes):
     for x in ["bytes", "KB", "MB", "GB", "TB"]:
@@ -78,3 +140,30 @@
         hertz /= 1000.0
 
     return string
+
+def string_to_type(string):
+    """Return a typed representation for the given string.
+
+    The result might be a bool, int or float. The string might also be
+    supplemented by a multiplier like KB which would return an int or
+    float multiplied by 1024 for example.
+
+    :param string: The string representation.
+    """
+    if isinstance(string, basestring):
+        for regex, formatter in TYPE_FORMATS:
+            match = regex.match(string)
+            if match:
+                string = formatter(match)
+                if len(match.groups()) > 1:
+                    unit = match.group(2)
+                    for regex, multiplier in TYPE_MULTIPLIERS:
+                        match = regex.match(unit)
+                        if match:
+                            string *= multiplier
+                            break
+                    else:
+                        raise ValueError("Unknown multiplier: %s" % unit)
+                break
+
+    return string
 
=== modified file 'checkbox/lib/dmi.py'
--- checkbox/lib/dmi.py	2009-09-08 23:01:38 +0000
+++ checkbox/lib/dmi.py	2011-11-18 18:04:27 +0000
@@ -16,13 +16,15 @@
 # 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
+
 
 # See also 3.3.4.1 of the "System Management BIOS Reference Specification,
 # Version 2.6.1" (Preliminary Standard) document, available from
 # http://www.dmtf.org/standards/smbios.
 class Dmi:
     chassis = (
-        ("Undefined",             "unknown"), # 0x00
+        ("Undefined",             "unknown"),  # 0x00
         ("Other",                 "unknown"),
         ("Unknown",               "unknown"),
         ("Desktop",               "desktop"),
@@ -53,22 +55,171 @@
         ("Blade",                 "server"),
         ("Blade Enclosure",       "unknown"))
 
-    chassis_names = [c[0] for c in chassis]
-    chassis_types = [c[1] for c in chassis]
+    chassis_names = tuple(c[0] for c in chassis)
+    chassis_types = tuple(c[1] for c in chassis)
     chassis_name_to_type = dict(chassis)
 
-
-class DmiNotAvailable(object):
-    def __init__(self, function):
-        self._function = function
-
-    def __get__(self, instance, cls=None):
-        self._instance = instance
-        return self
-
-    def __call__(self, *args, **kwargs):
-        name = self._function(self._instance, *args, **kwargs)
-        if name == "Not Available":
-            name = None
-
-        return name
+    type_names = (
+        "BIOS",  # 0x00
+        "System",
+        "Base Board",
+        "Chassis",
+        "Processor",
+        "Memory Controller",
+        "Memory Module",
+        "Cache",
+        "Port Connector",
+        "System Slots",
+        "On Board Devices",
+        "OEM Strings",
+        "System Configuration Options",
+        "BIOS Language",
+        "Group Associations",
+        "System Event Log",
+        "Physical Memory Array",
+        "Memory Device",
+        "32-bit Memory Error",
+        "Memory Array Mapped Address",
+        "Memory Device Mapped Address",
+        "Built-in Pointing Device",
+        "Portable Battery",
+        "System Reset",
+        "Hardware Security",
+        "System Power Controls",
+        "Voltage Probe",
+        "Cooling Device",
+        "Temperature Probe",
+        "Electrical Current Probe",
+        "Out-of-band Remote Access",
+        "Boot Integrity Services",
+        "System Boot",
+        "64-bit Memory Error",
+        "Management Device",
+        "Management Device Component",
+        "Management Device Threshold Data",
+        "Memory Channel",
+        "IPMI Device",
+        "Power Supply",
+        )
+
+
+class DmiDevice:
+
+    bus = "dmi"
+    driver = None
+    product_id = None
+    vendor_id = None
+
+    _product_blacklist = (
+        "<BAD INDEX>",
+        "N/A",
+        "Not Available",
+        "INVALID",
+        "OEM",
+        "Product Name",
+        "System Product Name",
+        "To be filled by O.E.M.",
+        "To Be Filled By O.E.M.",
+        "To Be Filled By O.E.M. by More String",
+        "Unknown",
+        "Uknown",
+        "Unknow",
+        "xxxxxxxxxxxxxx",
+        )
+    _vendor_blacklist = (
+        "<BAD INDEX>",
+        "Not Available",
+        "OEM",
+        "OEM Manufacturer",
+        "System manufacturer",
+        "System Manufacturer",
+        "System Name",
+        "To be filled by O.E.M.",
+        "To Be Filled By O.E.M.",
+        "To Be Filled By O.E.M. by More String",
+        "Unknow",  # XXX This is correct mispelling
+        "Unknown",
+        )
+    _serial_blacklist = (
+       "0",
+       "00000000",
+       "00 00 00 00 00 00 00 00",
+       "0123456789",
+       "Base Board Serial Number",
+       "Chassis Serial Number",
+       "N/A",
+       "None",
+       "Not Applicable",
+       "Not Available",
+       "Not Specified",
+       "OEM",
+       "System Serial Number",
+       )
+    _version_blacklist = (
+        "-1",
+        "<BAD INDEX>",
+        "N/A",
+        "None",
+        "Not Applicable",
+        "Not Available",
+        "Not Specified",
+        "OEM",
+        "System Version",
+        "Unknown",
+        "x.x",
+        )
+
+    def __init__(self, attributes, category):
+        self._attributes = attributes
+        self.category = category
+
+    @property
+    def path(self):
+        path = "/devices/virtual/dmi/id"
+        return os.path.join(path, self.category.lower())
+
+    @property
+    def product(self):
+        if self.category == "CHASSIS":
+            type_string = self._attributes.get("chassis_type", "0")
+            try:
+                type_index = int(type_string)
+                return Dmi.chassis_names[type_index]
+            except ValueError:
+                return type_string
+
+        for name in "name", "version":
+            attribute = "%s_%s" % (self.category.lower(), name)
+            product = self._attributes.get(attribute)
+            if product and product not in self._product_blacklist:
+                return product
+
+        return None
+
+    @property
+    def vendor(self):
+        for name in "manufacturer", "vendor":
+            attribute = "%s_%s" % (self.category.lower(), name)
+            vendor = self._attributes.get(attribute)
+            if vendor and vendor not in self._vendor_blacklist:
+                return vendor
+
+        return None
+
+    @property
+    def serial(self):
+        attribute = "%s_serial" % self.category.lower()
+        serial = self._attributes.get(attribute)
+        if serial and serial not in self._serial_blacklist:
+            return serial
+
+        return None
+
+    @property
+    def version(self):
+        attribute = "%s_version" % self.category.lower()
+        version = self._attributes.get(attribute)
+        if version and version not in self._version_blacklist:
+            return version
+
+        return None
 
=== modified file 'checkbox/lib/safe.py'
--- checkbox/lib/safe.py	2009-03-17 09:46:16 +0000
+++ checkbox/lib/safe.py	2011-11-18 18:04:27 +0000
@@ -94,3 +94,8 @@
         md5sum = digest.hexdigest()
 
     return md5sum
+
+def safe_close(file):
+    file.flush()
+    os.fsync(file.fileno())
+    file.close()
 
=== modified file 'checkbox/lib/template.py'
--- checkbox/lib/template.py	2010-04-06 14:17:46 +0000
+++ checkbox/lib/template.py	2011-11-18 18:04:27 +0000
@@ -95,7 +95,7 @@
                 if line.startswith("#"):
                     continue
 
-                match = re.search(r"^([-_.A-Za-z0-9]*):\s?(.*)", line)
+                match = re.search(r"^([-_.A-Za-z0-9@]*):\s?(.*)", line)
                 if match:
                     _save(field, value, extended)
                     field = match.groups()[0].lower()
 
=== modified file 'checkbox/message.py'
--- checkbox/message.py	2010-03-09 16:58:36 +0000
+++ checkbox/message.py	2011-11-18 18:04:27 +0000
@@ -22,7 +22,7 @@
 import posixpath
 
 from checkbox.contrib import bpickle
-
+from checkbox.lib.safe import safe_close
 
 HELD = "h"
 BROKEN = "b"
@@ -215,7 +215,7 @@
         try:
             return file.read()
         finally:
-            file.close()
+            safe_close(file)
 
     def _get_flags(self, path):
         basename = posixpath.basename(path)
@@ -253,7 +253,8 @@
 
         file = open(filename + ".tmp", "w")
         file.write(message_data)
-        file.close()
+        safe_close(file)
+
         os.rename(filename + ".tmp", filename)
 
         # For now we use the inode as the message id, as it will work
 
=== modified file 'checkbox/parsers/cpuinfo.py'
--- checkbox/parsers/cpuinfo.py	2011-06-13 14:22:39 +0000
+++ checkbox/parsers/cpuinfo.py	2011-11-18 18:04:27 +0000
@@ -16,24 +16,26 @@
 # 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 re
 
+from os import uname
+
 from checkbox.lib.conversion import string_to_type
-from checkbox.parsers.utils import implement_from_dict
-
-
-class CpuinfoParser(object):
-
-    def __init__(self, stream, uname=None):
+
+
+class CpuinfoParser:
+    """Parser for the /proc/cpuinfo file."""
+
+    def __init__(self, stream, machine=None):
         self.stream = stream
-        self.uname = uname or os.uname()[4].lower()
+        self.machine = machine or uname()[4].lower()
 
     def getAttributes(self):
         count = 0
         attributes = {}
         cpuinfo = self.stream.read()
-        for block in cpuinfo.split("\n\n"):
+        for block in re.split(r"\n{2,}", cpuinfo):
+            block = block.strip()
             if not block:
                 continue
 
@@ -54,19 +56,23 @@
 
                 attributes[key.lower()] = value
 
-        attributes["count"] = count
+        if attributes:
+            attributes["count"] = count
+
         return attributes
 
     def run(self, result):
-        uname = self.uname
         attributes = self.getAttributes()
+        if not attributes:
+            return
 
         # Default values
+        machine = self.machine
         processor = {
-            "platform": uname,
+            "platform": machine,
             "count": 1,
-            "type": self.uname,
-            "model": self.uname,
+            "type": machine,
+            "model": machine,
             "model_number": "",
             "model_version": "",
             "model_revision": "",
@@ -113,7 +119,6 @@
                 "type": "platform",
                 "model": "cpu",
                 "model_version": "revision",
-                "vendor": "machine",
                 "speed": "clock"},
             ("sparc64", "sparc",): {
                 "count": "ncpus probed",
@@ -126,7 +131,7 @@
         bogompips_string = attributes.get("bogomips", "0.0")
         processor["bogomips"] = int(round(float(bogompips_string)))
         for platform, conversion in platform_to_conversion.iteritems():
-            if uname in platform:
+            if machine in platform:
                 for pkey, ckey in conversion.iteritems():
                     if isinstance(ckey, (list, tuple)):
                         processor[pkey] = "/".join([attributes[k]
@@ -134,13 +139,11 @@
                     elif ckey in attributes:
                         processor[pkey] = attributes[ckey]
 
-        # Adjust platform and vendor
-        if uname[0] == "i" and uname[-2:] == "86":
-            processor["platform"] = "i386"
-        elif uname[:5] == "alpha":
-            processor["platform"] = "alpha"
-        elif uname[:5] == "sparc":
-            processor["vendor"] = "sun"
+        # Adjust platform
+        if machine[0] == "i" and machine[-2:] == "86":
+            processor["platform"] = u"i386"
+        elif machine[:5] == "alpha":
+            processor["platform"] = u"alpha"
 
         # Adjust cache
         if processor["cache"]:
@@ -148,14 +151,14 @@
 
         # Adjust speed
         try:
-            if uname[:5] == "alpha":
+            if machine[:5] == "alpha":
                 speed = processor["speed"].split()[0]
                 processor["speed"] = int(round(float(speed))) / 1000000
-            elif uname[:5] == "sparc":
+            elif machine[:5] == "sparc":
                 speed = processor["speed"]
                 processor["speed"] = int(round(float(speed))) / 2
             else:
-                if uname[:3] == "ppc":
+                if machine[:3] == "ppc":
                     # String is appended with "mhz"
                     speed = processor["speed"][:-3]
                 else:
@@ -174,18 +177,4 @@
             if processor["count"] == 0:
                 processor["count"] = 1
 
-        for key, value in processor.iteritems():
-            camel_case = key.replace("_", " ").title().replace(" ", "")
-            method_name = "set%s" % camel_case
-            method = getattr(result, method_name)
-            method(value)
-
-
-class CpuinfoResult(dict):
-
-    def __getattr__(self, name):
-        name = re.sub(r"([A-Z])", "_\\1", name)[4:].lower()
-        def setAll(value):
-            self[name] = value
-
-        return setAll
+        result.setProcessor(processor)
 
=== added file 'checkbox/parsers/cputable'
--- checkbox/parsers/cputable	1970-01-01 00:00:00 +0000
+++ checkbox/parsers/cputable	2011-11-18 18:04:27 +0000
@@ -0,0 +1,40 @@
+# This file contains the table of known CPU names.
+#
+# Architecture names are formed as a combination of the system name
+# (from ostable) and CPU name (from this table) after mapping from
+# the Debian triplet (from triplettable). A list of architecture
+# names in the Debian ‘sid’ distribution can be found in the archtable
+# file.
+#
+# Column 1 is the Debian name for the CPU, used to form the cpu part in
+# the Debian triplet.
+# Column 2 is the GNU name for the CPU, used to output build and host
+# targets in ‘dpkg-architecture’.
+# Column 3 is an extended regular expression used to match against the
+# CPU part of the output of the GNU config.guess script.
+# Column 4 is the size (in bits) of the integers/pointers
+# Column 5 is the endianness (byte ordering in numbers)
+#
+# <Debian name>	<GNU name>	<config.guess regex>	<Bits>	<Endianness>
+i386		i686		(i[3456]86|pentium)	32	little
+ia64		ia64		ia64			64	little
+alpha		alpha		alpha.*			64	little
+amd64		x86_64		x86_64			64	little
+armeb		armeb		arm.*b			32	big
+arm		arm		arm.*			32	little
+avr32		avr32		avr32			32	big
+hppa		hppa		hppa.*			32	big
+m32r		m32r		m32r			32	big
+m68k		m68k		m68k			32	big
+mips		mips		mips(eb)?		32	big
+mipsel		mipsel		mipsel			32	little
+powerpc		powerpc		(powerpc|ppc)		32	big
+ppc64		powerpc64	(powerpc|ppc)64		64	big
+s390		s390		s390			32	big
+s390x		s390x		s390x			64	big
+sh3		sh3		sh3			32	little
+sh3eb		sh3eb		sh3eb			32	big
+sh4		sh4		sh4			32	little
+sh4eb		sh4eb		sh4eb			32	big
+sparc		sparc		sparc			32	big
+sparc64		sparc64		sparc64			64	big
 
=== added file 'checkbox/parsers/cputable.py'
--- checkbox/parsers/cputable.py	1970-01-01 00:00:00 +0000
+++ checkbox/parsers/cputable.py	2011-11-18 18:04:27 +0000
@@ -0,0 +1,42 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2011 Canonical Ltd.
+#
+# 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/>.
+#
+import re
+
+
+CPUTABLE_RE = re.compile(
+    r"^(?!\#)(?P<debian_name>\S+)"
+    r"\s+(?P<gnu_name>\S+)"
+    r"\s+(?P<regex>\S+)"
+    r"\s+(?P<bits>\d+)"
+    r"\s+(?P<endianness>big|little)")
+
+
+class CputableParser:
+    """Parser for the /usr/share/dpkg/cputable file."""
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def run(self, result):
+        for line in self.stream.readlines():
+            match = CPUTABLE_RE.match(line)
+            if match:
+                cpu = match.groupdict()
+                cpu["bits"] = int(cpu["bits"])
+                result.addCpu(cpu)
 
=== added file 'checkbox/parsers/deferred.py'
--- checkbox/parsers/deferred.py	1970-01-01 00:00:00 +0000
+++ checkbox/parsers/deferred.py	2011-11-18 18:04:27 +0000
@@ -0,0 +1,27 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2011 Canonical Ltd.
+#
+# 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/>.
+#
+class DeferredParser:
+    """Parser for deferred dispatching of events."""
+
+    def __init__(self, dispatcher, event_type="result"):
+        self.dispatcher = dispatcher
+        self.event_type = event_type
+
+    def run(self, result):
+        self.dispatcher.publishEvent(self.event_type, result)
 
=== added file 'checkbox/parsers/dmidecode.py'
--- checkbox/parsers/dmidecode.py	1970-01-01 00:00:00 +0000
+++ checkbox/parsers/dmidecode.py	2011-11-18 18:04:27 +0000
@@ -0,0 +1,123 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2011 Canonical Ltd.
+#
+# 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/>.
+#
+import re
+
+from string import (
+    hexdigits,
+    uppercase,
+    )
+
+from checkbox.lib.dmi import (
+    Dmi,
+    DmiDevice,
+    )
+
+
+HANDLE_RE = re.compile(
+    r"^Handle (?P<handle>0x[%s]{4}), "
+    r"DMI type (?P<type>\d+), "
+    r"(?P<size>\d+) bytes$"
+    % hexdigits)
+KEY_VALUE_RE = re.compile(
+    r"^\t(?P<key>[%s].+):( (?P<value>.+))?$"
+    % uppercase)
+
+
+class DmidecodeParser:
+    """Parser for the dmidecode command."""
+
+    _key_map = {
+        "ID": "serial",
+        "Manufacturer": "vendor",
+        "Product Name": "name",
+        "Serial Number": "serial",
+        "Type": "type",
+        "Vendor": "vendor",
+        "Version": "version",
+        }
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def _parseKey(self, key):
+        return self._key_map.get(key)
+
+    def _parseValue(self, value):
+        if value is not None:
+            value = value.strip()
+            if not value:
+                value = None
+
+        return value
+
+    def run(self, result):
+        output = self.stream.read()
+        for record in re.split(r"\n{2,}", output):
+            record = record.strip()
+            # Skip empty records
+            if not record:
+                continue
+
+            # Skip header record
+            lines = record.split("\n")
+            line = lines.pop(0)
+            if line.startswith("#"):
+                continue
+
+            # Skip records with an unsupported handle
+            match = HANDLE_RE.match(line)
+            if not match:
+                continue
+
+            # Skip records that are empty or inactive
+            if not lines or lines.pop(0) == "Inactive":
+                continue
+
+            # Skip disabled entries and end-of-table marker
+            type_index = int(match.group("type"))
+            if type_index >= len(Dmi.type_names):
+                continue
+
+            category = Dmi.type_names[type_index]
+            category = category.upper().split(" ")[-1]
+            if category not in (
+                "BOARD", "BIOS", "CHASSIS", "PROCESSOR", "SYSTEM"):
+                continue
+
+            # Parse attributes
+            attributes = {}
+            for line in lines:
+                # Skip lines with an unsupported key/value pair
+                match = KEY_VALUE_RE.match(line)
+                if not match:
+                    continue
+
+                # Skip lines with an unsupported key
+                key = self._parseKey(match.group("key"))
+                if not key:
+                    continue
+
+                key = "%s_%s" % (category.lower(), key)
+                value = self._parseValue(match.group("value"))
+                attributes[key] = value
+
+            device = DmiDevice(attributes, category)
+            result.addDmiDevice(device)
+
+        return result
 
=== added file 'checkbox/parsers/meminfo.py'
--- checkbox/parsers/meminfo.py	1970-01-01 00:00:00 +0000
+++ checkbox/parsers/meminfo.py	2011-11-18 18:04:27 +0000
@@ -0,0 +1,46 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2011 Canonical Ltd.
+#
+# 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/>.
+#
+import re
+
+
+class MeminfoParser:
+    """Parser for the /proc/meminfo file."""
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def run(self, result):
+        key_value_pattern = re.compile(r"(?P<key>.*):\s+(?P<value>.*)")
+        meminfo_map = {
+            "MemTotal": "total",
+            "SwapTotal": "swap"}
+
+        meminfo = {}
+        for line in self.stream.readlines():
+            line = line.strip()
+            match = key_value_pattern.match(line)
+            if match:
+                key = match.group("key")
+                if key in meminfo_map:
+                    key = meminfo_map[key]
+                    value = match.group("value")
+                    (integer, factor) = value.split()
+                    meminfo[key] = int(integer) * 1024
+
+        result.setMemory(meminfo)
 
=== modified file 'checkbox/parsers/submission.py'
--- checkbox/parsers/submission.py	2011-06-13 14:22:39 +0000
+++ checkbox/parsers/submission.py	2011-11-18 18:04:27 +0000
@@ -16,430 +16,521 @@
 # 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 logging
-
-from datetime import (
-    datetime,
-    timedelta,
-    )
-from dateutil import tz
-
-from checkbox.parsers.device import DeviceResult
-from checkbox.parsers.udev import UdevParser
-from checkbox.parsers.utils import implement_from_dict
-
 try:
     import xml.etree.cElementTree as etree
 except ImportError:
     import cElementTree as etree
 
-
-_time_regex = re.compile(r"""
-    ^(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d)
-    T(?P<hour>\d\d):(?P<minute>\d\d):(?P<second>\d\d)
-    (?:\.(?P<second_fraction>\d{0,6}))?
-    (?P<tz>
-        (?:(?P<tz_sign>[-+])(?P<tz_hour>\d\d):(?P<tz_minute>\d\d))
-        | Z)?$
-    """,
-    re.VERBOSE)
-
-_xml_illegal_regex = re.compile(
-    u"([\u0000-\u0008\u000b-\u000c\u000e-\u001f\ufffe-\uffff])"
-    + u"|([%s-%s][^%s-%s])|([^%s-%s][%s-%s])|([%s-%s]$)|(^[%s-%s])" % (
-    unichr(0xd800),unichr(0xdbff),unichr(0xdc00),unichr(0xdfff),
-    unichr(0xd800),unichr(0xdbff),unichr(0xdc00),unichr(0xdfff),
-    unichr(0xd800),unichr(0xdbff),unichr(0xdc00),unichr(0xdfff)))
-
-
-class HALDevice(object):
-
-    def __init__(self, id, udi, properties):
-        self.id = id
-        self.udi = udi
-        self.properties = properties
-
-
-class SubmissionStream(object):
-
-    default_size = 4096
-
-    def __init__(self, stream):
-        self.stream = stream
-        self._buffer = ""
-        self._buffers = []
-
-    def read(self, size=None):
-        if size is None:
-            size = self.default_size
-
-        info_start_regex = re.compile("^<info .*>$")
-        info_end_regex = re.compile("^</info>$")
-
-        in_info = False
-        length = sum(len(buffer) for buffer in self._buffers)
-
-        while length < size:
-            try:
-                buffer = self.stream.next()
-            except StopIteration:
-                break
-
-            if not in_info:
-                if info_start_regex.match(buffer):
-                    in_info = True
-                    self._buffer += "".join(self._buffers)
-                    self._buffers = [buffer]
-                else:
-                    length += len(buffer)
-                    self._buffers.append(buffer)
-            else:
-                self._buffers.append(buffer)
-                if info_end_regex.match(buffer):
-                    in_info = False
-
-                    buffer = "".join(self._buffers)
-                    self._buffers = []
-
-                    if not _xml_illegal_regex.search(buffer):
-                        length += len(buffer)
-                        self._buffer += buffer
-
-        if self._buffers:
-            self._buffer += "".join(self._buffers)
-            self._buffers = []
-
-        if not self._buffer:
-            return None
-
-        data = self._buffer[:size]
-        self._buffers = [self._buffer[size:]]
-        self._buffer = ""
-
-        return data
-
-
-class SubmissionParser(object):
-
-    default_name = "unknown"
-
-    def __init__(self, stream, name=None):
-        self.stream = SubmissionStream(stream)
-        self.name = name or self.default_name
+from StringIO import StringIO
+from logging import getLogger
+from pkg_resources import resource_string
+
+from checkbox.lib.conversion import string_to_datetime
+
+from checkbox import parsers
+from checkbox.dispatcher import DispatcherQueue
+from checkbox.parsers.cpuinfo import CpuinfoParser
+from checkbox.parsers.cputable import CputableParser
+from checkbox.parsers.deferred import DeferredParser
+from checkbox.parsers.dmidecode import DmidecodeParser
+from checkbox.parsers.meminfo import MeminfoParser
+from checkbox.parsers.udevadm import UdevadmParser
+from checkbox.job import (FAIL, PASS, UNINITIATED, UNRESOLVED,
+    UNSUPPORTED, UNTESTED)
+
+
+class SubmissionResult:
+
+    def __init__(self, test_run_factory, **kwargs):
+        self.test_run_factory = test_run_factory
+        self.test_run_kwargs = kwargs
+        self.dispatcher = DispatcherQueue()
+
+        # Register handlers to incrementally add information
+        register = self.dispatcher.registerHandler
+        register(("cpu", "architecture",), self.addCpuArchitecture)
+        register(("identifier",), self.addIdentifier)
+        register(("test_run", "attachment",), self.addAttachment)
+        register(("test_run", "device",), self.addDeviceState)
+        register(("test_run", "distribution",), self.setDistribution)
+        register(("test_run", "package_version",), self.addPackageVersion)
+        register(("test_run", "test_result",), self.addTestResult)
+
+        # Register handlers to set information once
+        register(("architecture",), self.setArchitecture, count=1)
+        register(
+            ("cpuinfo", "machine", "cpuinfo_result",),
+            self.setCpuinfo, count=1)
+        register(
+            ("meminfo", "meminfo_result",),
+            self.setMeminfo, count=1)
+        register(
+            ("project", "series",),
+            self.setTestRun, count=1)
+        register(
+            ("test_run", "architecture",),
+            self.setArchitectureState, count=1)
+        register(
+            ("test_run", "memory",),
+            self.setMemoryState, count=1)
+        register(
+            ("test_run", "processor",),
+            self.setProcessorState, count=1)
+        register(
+            ("udevadm", "bits", "udevadm_result",),
+            self.setUdevadm, count=1)
+
+        # Publish events passed as keyword arguments
+        if "project" in kwargs:
+            self.dispatcher.publishEvent("project", kwargs.pop("project"))
+            self.dispatcher.publishEvent("series", kwargs.pop("series", None))
+
+    def addAttachment(self, test_run, attachment):
+        test_run.addAttachment(**attachment)
+
+    def addContext(self, text, command=None):
+        if text.strip() == "Command not found.":
+            return
+
+        self.dispatcher.publishEvent(
+            "attachment", {"name": command, "content": text })
+
+        parsers = {
+            "cat /proc/cpuinfo": self.parseCpuinfo,
+            "cat /proc/meminfo": self.parseMeminfo,
+            "dmidecode": DmidecodeParser,
+            "udevadm info --export-db": self.parseUdevadm,
+            }
+        parser = parsers.get(command)
+        if parser:
+            if not isinstance(text, unicode):
+                text = text.decode("utf-8")
+            stream = StringIO(text)
+            p = parser(stream)
+            p.run(self)
+
+    def addCpu(self, cpu):
+        self.dispatcher.publishEvent("cpu", cpu)
+
+    def addCpuArchitecture(self, cpu, architecture):
+        if cpu["debian_name"] == architecture:
+            self.dispatcher.publishEvent("machine", cpu["gnu_name"])
+            self.dispatcher.publishEvent("bits", cpu["bits"])
+
+    def addDevice(self, device):
+        self.dispatcher.publishEvent("device", device)
+
+    def addDeviceState(self, test_run, device):
+        test_run.addDeviceState(
+            bus_name=device.bus, category_name=device.category,
+            product_name=device.product, vendor_name=device.vendor,
+            product_id=device.product_id, vendor_id=device.vendor_id,
+            subproduct_id=device.subproduct_id,
+            subvendor_id=device.subvendor_id,
+            driver_name=device.driver, path=device.path)
+
+    def addDmiDevice(self, device):
+        if device.serial:
+            self.dispatcher.publishEvent("identifier", device.serial)
+
+        if device.category in ("BOARD", "SYSTEM") \
+           and device.vendor != device.product \
+           and device.product is not None:
+            self.dispatcher.publishEvent("model", device.product)
+            self.dispatcher.publishEvent("make", device.vendor)
+            self.dispatcher.publishEvent("version", device.version)
+
+    def addIdentifier(self, identifier):
+        try:
+            self.identifiers.append(identifier)
+        except AttributeError:
+            self.identifiers = [identifier]
+            self.dispatcher.publishEvent("identifiers", self.identifiers)
+
+    def addPackage(self, package):
+        package_version = {
+            "name": package["name"],
+            "version": package["properties"]["version"],
+            }
+        self.dispatcher.publishEvent("package_version", package_version)
+
+    def addPackageVersion(self, test_run, package_version):
+        test_run.addPackageVersion(**package_version)
+
+    def addQuestion(self, question):
+        answer_to_status = {
+            "fail": FAIL,
+            "no": FAIL,
+            "pass": PASS,
+            "skip": UNTESTED,
+            "uninitiated": UNINITIATED,
+            "unresolved": UNRESOLVED,
+            "unsupported": UNSUPPORTED,
+            "untested": UNTESTED,
+            "yes": PASS,
+            }
+
+        test_result = dict(
+            name=question["name"],
+            output=question["comment"],
+            status=answer_to_status[question["answer"]["value"]],
+            )
+        test_result.update(self.test_run_kwargs)
+        self.dispatcher.publishEvent("test_result", test_result)
+
+    def addTestResult(self, test_run, test_result):
+        test_run.addTestResult(**test_result)
+
+    def addSummary(self, name, value):
+        if name == "architecture":
+            self.dispatcher.publishEvent("architecture", value)
+        elif name == "distribution":
+            self.dispatcher.publishEvent("project", value)
+        elif name == "distroseries":
+            self.dispatcher.publishEvent("series", value)
+
+    def parseCpuinfo(self, cpuinfo):
+        self.dispatcher.publishEvent("cpuinfo", cpuinfo)
+        return DeferredParser(self.dispatcher, "cpuinfo_result")
+
+    def parseMeminfo(self, meminfo):
+        self.dispatcher.publishEvent("meminfo", meminfo)
+        return DeferredParser(self.dispatcher, "meminfo_result")
+
+    def parseUdevadm(self, udevadm):
+        self.dispatcher.publishEvent("udevadm", udevadm)
+        return DeferredParser(self.dispatcher, "udevadm_result")
+
+    def setArchitecture(self, architecture):
+        string = resource_string(parsers.__name__, "cputable")
+        stream = StringIO(string.decode("utf-8"))
+        parser = CputableParser(stream)
+        parser.run(self)
+
+    def setArchitectureState(self, test_run, architecture):
+        test_run.setArchitectureState(architecture)
+
+    def setCpuinfo(self, cpuinfo, machine, cpuinfo_result):
+        parser = CpuinfoParser(cpuinfo, machine)
+        parser.run(cpuinfo_result)
+
+    def setMeminfo(self, meminfo, meminfo_result):
+        parser = MeminfoParser(meminfo)
+        parser.run(meminfo_result)
+
+    def setDistribution(self, test_run, distribution):
+        test_run.setDistribution(**distribution)
+
+    def setLSBRelease(self, lsb_release):
+        self.dispatcher.publishEvent("distribution", lsb_release)
+
+    def setMemory(self, memory):
+        self.dispatcher.publishEvent("memory", memory)
+
+    def setMemoryState(self, test_run, memory):
+        test_run.setMemoryState(**memory)
+
+    def setProcessor(self, processor):
+        self.dispatcher.publishEvent("processor", processor)
+
+    def setProcessorState(self, test_run, processor):
+        test_run.setProcessorState(
+            platform_name=processor["platform"],
+            make=processor["type"], model=processor["model"],
+            model_number=processor["model_number"],
+            model_version=processor["model_version"],
+            model_revision=processor["model_revision"],
+            cache=processor["cache"], other=processor["other"],
+            bogomips=processor["bogomips"], speed=processor["speed"],
+            count=processor["count"])
+
+    def setTestRun(self, project, series):
+        test_run = self.test_run_factory(
+            **self.test_run_kwargs)
+        self.dispatcher.publishEvent("test_run", test_run)
+
+    def setUdevadm(self, udevadm, bits, udevadm_result):
+        parser = UdevadmParser(udevadm, bits)
+        parser.run(udevadm_result)
+
+
+class SubmissionParser:
+
+    def __init__(self, file):
+        self.file = file
+        self.logger = getLogger()
 
     def _getClient(self, node):
-        return "_".join([node.get('name'), node.get('version')])
+        """Return a dictionary with the name and version of the client."""
+        return {
+            "name": node.get("name"),
+            "version": node.get("version"),
+            }
 
     def _getProperty(self, node):
-        """Parse a <property> node.
-
-        :return: (name, (value, type)) of a property.
-        """
-        return (node.get('name'), self._getValueAttribute(node))
+        """Return the (name, value) of a property."""
+        return (node.get("name"), self._getValueAsType(node))
 
     def _getProperties(self, node):
-        """Parse <property> sub-nodes of node.
-
-        :return: A dictionary, where each key is the name of a property;
-                 the values are the tuples (value, type) of a property.
-        """
+        """Return a dictionary of properties."""
         properties = {}
         for child in node.getchildren():
+            assert child.tag == "property", \
+                "Unexpected tag <%s>, expected <property>" % child.tag
             name, value = self._getProperty(child)
-            if name in properties:
-                raise ValueError(
-                    '<property name="%s"> found more than once in <%s>'
-                    % (name, node.tag))
             properties[name] = value
 
         return properties
 
-    def _getValueAttribute(self, node):
-        """Return (value, type) of a <property> or <value> node."""
-        type_ = node.get('type')
-        if type_ in ('dbus.Boolean', 'bool'):
-            value = node.text.strip() == 'True'
-
-        elif type_ in ('str', 'dbus.String', 'dbus.UTF8String'):
+    def _getValueAsType(self, node):
+        """Return value of a node as the type attribute."""
+        type_ = node.get("type")
+        if type_ in ("bool",):
             value = node.text.strip()
-
-        elif type_ in ('dbus.Byte', 'dbus.Int16', 'dbus.Int32', 'dbus.Int64',
-                       'dbus.UInt16', 'dbus.UInt32', 'dbus.UInt64', 'int',
-                       'long'):
-            value = int(node.text.strip())
-
-        elif type_ in ('dbus.Double', 'float'):
-            value = float(node.text.strip())
-
-        elif type_ in ('dbus.Array', 'list'):
-            value = [self._getValueAttribute(child)
-                for child in node.getchildren()]
-
-        elif type_ in ('dbus.Dictionary', 'dict'):
-            value = dict((child.get('name'), self._getValueAttribute(child))
-                for child in node.getchildren())
-
+            assert value in ("True", "False",), \
+                "Unexpected boolean value '%s' in <%s>" % (value, node.tag)
+            return value == "True"
+        elif type_ in ("str",):
+            return unicode(node.text.strip())
+        elif type_ in ("int", "long",):
+            return int(node.text.strip())
+        elif type_ in ("float",):
+            return float(node.text.strip())
+        elif type_ in ("list",):
+            return list(self._getValueAsType(child)
+                for child in node.getchildren())
+        elif type_ in ("dict",):
+            return dict((child.get("name"), self._getValueAsType(child))
+                for child in node.getchildren())
         else:
-            # This should not happen.
             raise AssertionError(
-                'Unexpected <property> or <value> type: %s' % type_)
-
-        return value
-
-    def _getValueAttributeAsBoolean(self, node):
+                "Unexpected type '%s' in <%s>" % (type_, node.tag))
+
+    def _getValueAsBoolean(self, node):
         """Return the value of the attribute "value" as a boolean."""
-        return node.attrib['value'] == "True"
-
-    def _getValueAttributeAsString(self, node):
+        value = node.attrib["value"]
+        assert value in ("True", "False",), \
+            "Unexpected boolean value '%s' in tag <%s>" % (value, node.tag)
+        return value == "True"
+
+    def _getValueAsDatetime(self, node):
+        """Return the value of the attribute "value" as a datetime."""
+        string = node.attrib["value"]
+        return string_to_datetime(string)
+
+    def _getValueAsString(self, node):
         """Return the value of the attribute "value"."""
-        return node.attrib['value']
-
-    def _getValueAttributeAsDateTime(self, node):
-        """Convert a "value" attribute into a datetime object."""
-        time_text = node.get('value')
-
-        # we cannot use time.strptime: this function accepts neither fractions
-        # of a second nor a time zone given e.g. as '+02:30'.
-        match = _time_regex.search(time_text)
-
-        if match is None:
-            raise ValueError(
-                'Timestamp with unreasonable value: %s' % time_text)
-
-        time_parts = match.groupdict()
-
-        year = int(time_parts['year'])
-        month = int(time_parts['month'])
-        day = int(time_parts['day'])
-        hour = int(time_parts['hour'])
-        minute = int(time_parts['minute'])
-        second = int(time_parts['second'])
-        second_fraction = time_parts['second_fraction']
-        if second_fraction is not None:
-            milliseconds = second_fraction + '0' * (6 - len(second_fraction))
-            milliseconds = int(milliseconds)
-        else:
-            milliseconds = 0
-
-        if second > 59:
-            second = 59
-            milliseconds = 999999
-
-        timestamp = datetime(year, month, day, hour, minute, second,
-                             milliseconds, tzinfo=tz.tzutc())
-
-        tz_sign = time_parts['tz_sign']
-        tz_hour = time_parts['tz_hour']
-        tz_minute = time_parts['tz_minute']
-        if tz_sign in ('-', '+'):
-            delta = timedelta(hours=int(tz_hour), minutes=int(tz_minute))
-            if tz_sign == '-':
-                timestamp = timestamp + delta
-            else:
-                timestamp = timestamp - delta
-
-        return timestamp
-
-    def _parseHAL(self, result, node):
-        result.startDevices()
-        for child in node.getchildren():
-            id = int(child.get('id'))
-            udi = child.get('udi')
-            properties = self._getProperties(child)
-            device = HALDevice(id, udi, properties)
-            result.addDevice(device)
-
-        result.endDevices()
-
-    def _parseInfo(self, result, node):
-        command = node.attrib['command']
-        if command == "udevadm info --export-db":
-            self._parseUdev(result, node)
-
-        result.addInfo(command, node.text)
-
-    def _parseUdev(self, result, node):
-        result.startDevices()
-
-        stream = StringIO(node.text)
-        udev = UdevParser(stream)
-        udev.run(result)
-
-        result.endDevices()
-
-    def _parseProcessors(self, result, node):
-        result.startProcessors()
-
-        for child in node.getchildren():
-            id = int(child.get('id'))
-            name = child.get('name')
-            properties = self._getProperties(child)
-            result.addProcessor(id, name, properties)
-
-        result.endProcessors()
-
-    def _parseRoot(self, result, node):
-        parsers = {
-            "summary": self._parseSummary,
-            "hardware": self._parseHardware,
-            "software": self._parseSoftware,
-            "questions": self._parseQuestions,
-            "context": self._parseContext,
-            }
-
-        for child in node.getchildren():
-            parser = parsers.get(child.tag, self._parseNone)
-            parser(result, child)
-
-    def _parseSummary(self, result, node):
-        parsers = {
-            'live_cd': self._getValueAttributeAsBoolean,
-            'system_id': self._getValueAttributeAsString,
-            'distribution': self._getValueAttributeAsString,
-            'distroseries': self._getValueAttributeAsString,
-            'architecture': self._getValueAttributeAsString,
-            'private': self._getValueAttributeAsBoolean,
-            'contactable': self._getValueAttributeAsBoolean,
-            'date_created': self._getValueAttributeAsDateTime,
-            'client': self._getClient,
-            'kernel-release': self._getValueAttributeAsString,
-            }
-
-        for child in node.getchildren():
-            parser = parsers.get(child.tag, self._parseNone)
-            value = parser(child)
-            result.addSummary(child.tag, value)
-
-    def _parseHardware(self, result, node):
-        parsers = {
-            'hal': self._parseHAL,
-            'processors': self._parseProcessors,
-            'udev': self._parseUdev,
-            }
-
-        for child in node.getchildren():
-            parser = parsers.get(child.tag, self._parseNone)
-            parser(result, child)
-
-    def _parseLSBRelease(self, result, node):
+        return unicode(node.attrib["value"])
+
+    def parseContext(self, result, node):
+        """Parse the <context> part of a submission."""
+        duplicates = set()
+        for child in node.getchildren():
+            assert child.tag == "info", \
+                "Unexpected tag <%s>, expected <info>" % child.tag
+            command = child.get("command")
+            if command not in duplicates:
+                duplicates.add(command)
+                result.addContext(child.text, command)
+            else:
+                self.logger.debug(
+                    "Duplicate command found in tag <info>: %s" % command)
+
+    def parseHardware(self, result, node):
+        """Parse the <hardware> section of a submission."""
+        parsers = {
+            "dmi": DmidecodeParser,
+            "processors": self.parseProcessors,
+            "udev": result.parseUdevadm,
+            }
+
+        for child in node.getchildren():
+            parser = parsers.get(child.tag)
+            if parser:
+                if child.getchildren():
+                    parser(result, child)
+                else:
+                    text = child.text
+                    if not isinstance(text, unicode):
+                        text = text.decode("utf-8")
+                    stream = StringIO(text)
+                    p = parser(stream)
+                    p.run(result)
+            else:
+                self.logger.debug(
+                    "Unsupported tag <%s> in <hardware>" % child.tag)
+
+    def parseLSBRelease(self, result, node):
+        """Parse the <lsbrelease> part of a submission."""
         properties = self._getProperties(node)
-        result.setDistribution(**properties)
-
-    def _parsePackages(self, result, node):
-        result.startPackages()
-
-        for child in node.getchildren():
-            id = int(child.get('id'))
-            name = child.get('name')
+        result.setLSBRelease(properties)
+
+    def parsePackages(self, result, node):
+        """Parse the <packages> part of a submission."""
+        for child in node.getchildren():
+            assert child.tag == "package", \
+                "Unexpected tag <%s>, expected <package>" % child.tag
+
+            package = {
+                "name": child.get("name"),
+                "properties": self._getProperties(child),
+                }
+            result.addPackage(package)
+
+    def parseProcessors(self, result, node):
+        """Parse the <processors> part of a submission."""
+        processors = []
+        for child in node.getchildren():
+            assert child.tag == "processor", \
+                "Unexpected tag <%s>, expected <processor>" % child.tag
+
+            # Convert lists to space separated strings.
             properties = self._getProperties(child)
-
-            result.addPackage(id, name, properties)
-
-        result.endPackages()
-
-    def _parseXOrg(self, result, node):
-        drivers = {}
-        for child in node.getchildren():
-            info = dict(child.attrib)
-            if 'device' in info:
-                info['device'] = int(info['device'])
-
-            name = info['name']
-            if name in drivers:
-                raise ValueError(
-                    '<driver name="%s"> appears more than once in <xorg>'
-                    % name)
-
-            drivers[name] = info
-
-        version = node.get('version')
-        result.addXorg(version, drivers)
-
-    def _parseSoftware(self, result, node):
-        parsers = {
-            'lsbrelease': self._parseLSBRelease,
-            'packages': self._parsePackages,
-            'xorg': self._parseXOrg,
-            }
-
-        for child in node.getchildren():
-            parser = parsers.get(child.tag, self._parseNone)
-            parser(result, child)
-
-    def _parseQuestions(self, result, node):
-        result.startQuestions()
-
-        for child in node.getchildren():
-            question = {'name': child.get('name')}
-            plugin = child.get('plugin', None)
+            for key, value in properties.iteritems():
+                if key in ("bogomips", "cache", "count", "speed",):
+                    properties[key] = int(value)
+                elif isinstance(value, list):
+                    properties[key] = u" ".join(value)
+            processors.append(properties)
+
+        # Check if /proc/cpuinfo was parsed already.
+        if any("platform" in processor for processor in processors):
+            result.setProcessor(processors[0])
+        else:
+            lines = []
+            for processor in processors:
+                # Convert some keys with underscores to spaces instead.
+                for key, value in processor.iteritems():
+                    if "_" in key and key != "vendor_id":
+                        key = key.replace("_", " ")
+
+                    lines.append(u"%s: %s" % (key, value))
+
+                lines.append(u"")
+
+            stream = StringIO(u"\n".join(lines))
+            parser = result.parseCpuinfo(stream)
+            parser.run(result)
+
+    def parseQuestions(self, result, node):
+        """Parse the <questions> part of a submission."""
+        for child in node.getchildren():
+            assert child.tag == "question", \
+                "Unexpected tag <%s>, expected <question>" % child.tag
+            question = {
+                "name": child.get("name"),
+                "targets": [],
+                }
+            plugin = child.get("plugin", None)
             if plugin is not None:
-                question['plugin'] = plugin
-            question['targets'] = targets = []
+                question["plugin"] = plugin
+
             answer_choices = []
-
             for sub_node in child.getchildren():
                 sub_tag = sub_node.tag
-                if sub_tag == 'answer':
-                    question['answer'] = answer = {}
-                    answer['type'] = sub_node.get('type')
-                    if answer['type'] == 'multiple_choice':
-                        question['answer_choices'] = answer_choices
-                    unit = sub_node.get('unit', None)
+                if sub_tag == "answer":
+                    question["answer"] = answer = {}
+                    answer["type"] = sub_node.get("type")
+                    if answer["type"] == "multiple_choice":
+                        question["answer_choices"] = answer_choices
+                    unit = sub_node.get("unit", None)
                     if unit is not None:
-                        answer['unit'] = unit
-                    answer['value'] = sub_node.text.strip()
-                elif sub_tag == 'answer_choices':
+                        answer["unit"] = unit
+                    answer["value"] = sub_node.text.strip()
+
+                elif sub_tag == "answer_choices":
                     for value_node in sub_node.getchildren():
                         answer_choices.append(
-                            self._getValueAttribute(value_node))
-                elif sub_tag == 'target':
-                    target = {'id': int(sub_node.get('id'))}
-                    target['drivers'] = drivers = []
+                            self._getValueAsType(value_node))
+
+                elif sub_tag == "target":
+                    # The Relax NG schema ensures that the attribute
+                    # id exists and that it is an integer
+                    target = {"id": int(sub_node.get("id"))}
+                    target["drivers"] = drivers = []
                     for driver_node in sub_node.getchildren():
                         drivers.append(driver_node.text.strip())
-                    targets.append(target)
-                elif sub_tag in('comment', 'command'):
+                    question["targets"].append(target)
+
+                elif sub_tag in ("comment", "command",):
                     data = sub_node.text
                     if data is not None:
                         question[sub_tag] = data.strip()
 
+                else:
+                    raise AssertionError(
+                        "Unexpected tag <%s> in <question>" % sub_tag)
+
             result.addQuestion(question)
 
-        result.endQuestions()
-
-    def _parseContext(self, result, node):
-        parsers = {
-            'info': self._parseInfo,
-            }
-
-        for child in node.getchildren():
-            parser = parsers.get(child.tag, self._parseNone)
-            parser(result, child)
-
-    def _parseNone(self, result, node):
-        pass
-
-    def run(self, result):
+    def parseSoftware(self, result, node):
+        """Parse the <software> section of a submission."""
+        parsers = {
+            "lsbrelease": self.parseLSBRelease,
+            "packages": self.parsePackages,
+            }
+
+        for child in node.getchildren():
+            parser = parsers.get(child.tag)
+            if parser:
+                parser(result, child)
+            else:
+                self.logger.debug(
+                    "Unsupported tag <%s> in <software>" % child.tag)
+
+    def parseSummary(self, result, node):
+        """Parse the <summary> section of a submission."""
+        parsers = {
+            "architecture": self._getValueAsString,
+            "client": self._getClient,
+            "contactable": self._getValueAsBoolean,
+            "date_created": self._getValueAsDatetime,
+            "distribution": self._getValueAsString,
+            "distroseries": self._getValueAsString,
+            "kernel-release": self._getValueAsString,
+            "live_cd": self._getValueAsBoolean,
+            "private": self._getValueAsBoolean,
+            "system_id": self._getValueAsString,
+            }
+
+        for child in node.getchildren():
+            parser = parsers.get(child.tag)
+            if parser:
+                value = parser(child)
+                result.addSummary(child.tag, value)
+            else:
+                self.logger.debug(
+                    "Unsupported tag <%s> in <summary>" % child.tag)
+
+    def parseRoot(self, result, node):
+        """Parse the <system> root of a submission."""
+        parsers = {
+            "context": self.parseContext,
+            "hardware": self.parseHardware,
+            "questions": self.parseQuestions,
+            "software": self.parseSoftware,
+            "summary": self.parseSummary,
+            }
+
+        # Iterate over the root children, "summary" first
+        for child in node.getchildren():
+            parser = parsers.get(child.tag)
+            if parser:
+                parser(result, child)
+            else:
+                self.logger.debug(
+                    "Unsupported tag <%s> in <system>" % child.tag)
+
+    def run(self, test_run_factory, **kwargs):
         parser = etree.XMLParser()
 
-        try:
-            tree = etree.parse(self.stream, parser=parser)
-        except SyntaxError, error:
-            logging.error(error)
-            return
-
+        tree = etree.parse(self.file, parser=parser)
         root = tree.getroot()
         if root.tag != "system":
-            logging.error("Root node is not '<system>'")
-            return
-
-        self._parseRoot(result, root)
-
-
-SubmissionResult = implement_from_dict("SubmissionResult", [
-    "startDevices", "endDevices", "addDevice", "startPackages",
-    "endPackages", "addPackage", "startProcessors", "endProcessors",
-    "addProcessor", "startQuestions", "endQuestions", "addQuestion",
-    "addInfo", "addSummary", "addXorg", "setDistribution"], DeviceResult)
+            raise AssertionError(
+                "Unexpected tag <%s> at root, expected <system>" % root.tag)
+
+        result = SubmissionResult(test_run_factory, **kwargs)
+        self.parseRoot(result, root)
+
+        return result
 
=== renamed file 'checkbox/parsers/udev.py' => 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udev.py	2011-09-14 21:16:02 +0000
+++ checkbox/parsers/udevadm.py	2011-11-18 18:04:27 +0000
@@ -16,38 +16,78 @@
 # 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 re
 import string
-import posixpath
-
-from curses.ascii import isprint
-
-from checkbox.lib.bit import get_bitmask, test_bit
-from checkbox.lib.dmi import Dmi, DmiNotAvailable
+
+from checkbox.lib.bit import (
+    get_bitmask,
+    test_bit,
+    )
 from checkbox.lib.input import Input
 from checkbox.lib.pci import Pci
 from checkbox.lib.usb import Usb
 
 
-class UdevDevice(object):
-    __slots__ = ("_environment", "_attributes", "_stack")
-
-    def __init__(self, environment, attributes, stack=[]):
-        super(UdevDevice, self).__init__()
+PCI_RE = re.compile(
+    r"^pci:"
+    r"v(?P<vendor_id>[%(hex)s]{8})"
+    r"d(?P<product_id>[%(hex)s]{8})"
+    r"sv(?P<subvendor_id>[%(hex)s]{8})"
+    r"sd(?P<subproduct_id>[%(hex)s]{8})"
+    r"bc(?P<class>[%(hex)s]{2})"
+    r"sc(?P<subclass>[%(hex)s]{2})"
+    r"i(?P<interface>[%(hex)s]{2})"
+    % {"hex": string.hexdigits})
+PNP_RE = re.compile(
+    r"^acpi:"
+    r"(?P<vendor_name>[%(upper)s]{3})"
+    r"(?P<product_id>[%(hex)s]{4}):"
+    % {"upper": string.uppercase, "hex": string.hexdigits})
+USB_RE = re.compile(
+    r"^usb:"
+    r"v(?P<vendor_id>[%(hex)s]{4})"
+    r"p(?P<product_id>[%(hex)s]{4})"
+    r"d(?P<revision>[%(hex)s]{4})"
+    r"dc(?P<class>[%(hex)s]{2})"
+    r"dsc(?P<subclass>[%(hex)s]{2})"
+    r"dp(?P<protocol>[%(hex)s]{2})"
+    r"ic(?P<interface_class>[%(hex)s]{2})"
+    r"isc(?P<interface_subclass>[%(hex)s]{2})"
+    r"ip(?P<interface_protocol>[%(hex)s]{2})"
+    % {"hex": string.hexdigits})
+SCSI_RE = re.compile(
+    r"^scsi:"
+    r"t-0x(?P<type>[%(hex)s]{2})"
+    % {"hex": string.hexdigits})
+
+
+class UdevadmDevice:
+    __slots__ = ("_environment", "_bits", "_stack",)
+
+    def __init__(self, environment, bits=None, stack=[]):
         self._environment = environment
-        self._attributes = attributes
+        self._bits = bits
         self._stack = stack
 
     @property
     def bus(self):
-        return self._environment.get("SUBSYSTEM")
+        # Change the bus from 'acpi' to 'pnp' for some devices
+        if PNP_RE.match(self._environment.get("MODALIAS", "")) \
+           and self.path.endswith(":00"):
+            return "pnp"
+
+        # Change the bus from 'block' to parent
+        if self._environment.get("DEVTYPE") == "disk" and self._stack:
+            return self._stack[-1]._environment.get("SUBSYSTEM")
+
+        bus = self._environment.get("SUBSYSTEM")
+        if bus == "pnp":
+            return None
+
+        return bus
 
     @property
     def category(self):
-        if "sys_vendor" in self._attributes:
-            return "SYSTEM"
-
         if "IFINDEX" in self._environment:
             return "NETWORK"
 
@@ -69,7 +109,10 @@
                     return "NETWORK"
 
             if class_id == Pci.BASE_CLASS_DISPLAY:
-                return "VIDEO"
+                if subclass_id == Pci.CLASS_DISPLAY_VGA:
+                    return "VIDEO"
+                else:
+                    return "OTHER"
 
             if class_id == Pci.BASE_CLASS_SERIAL \
                and subclass_id == Pci.CLASS_SERIAL_USB:
@@ -113,13 +156,9 @@
                     or subclass_id == Pci.CLASS_BRIDGE_CARDBUS):
                 return "SOCKET"
 
-        if "bInterfaceClass" in self._attributes:
-            interface_class = int(
-                self._attributes["bInterfaceClass"], 16)
-            interface_subclass = int(
-                self._attributes["bInterfaceSubClass"], 16)
-            interface_protocol = int(
-                self._attributes["bInterfaceProtocol"], 16)
+        if "TYPE" in self._environment and "INTERFACE" in self._environment:
+            interface_class, interface_subclass, interface_protocol = (
+                int(i) for i in self._environment["INTERFACE"].split("/"))
 
             if interface_class == Usb.BASE_CLASS_AUDIO:
                 return "AUDIO"
@@ -143,6 +182,25 @@
                 else:
                     return "WIRELESS"
 
+        if "KEY" in self._environment:
+            key = self._environment["KEY"].strip("=")
+            bitmask = get_bitmask(key)
+
+            for i in range(Input.KEY_Q, Input.KEY_P + 1):
+                if not test_bit(i, bitmask, self._bits):
+                    break
+            else:
+                return "KEYBOARD"
+
+            if test_bit(Input.KEY_CAMERA, bitmask, self._bits):
+                return "CAPTURE"
+
+            if test_bit(Input.BTN_TOUCH, bitmask, self._bits):
+                return "TOUCH"
+
+            if test_bit(Input.BTN_MOUSE, bitmask, self._bits):
+                return "MOUSE"
+
         if "ID_TYPE" in self._environment:
             id_type = self._environment["ID_TYPE"]
 
@@ -155,22 +213,6 @@
             if id_type == "video":
                 return "VIDEO"
 
-        if "KEY" in self._environment:
-            key = self._environment["KEY"].strip("=")
-            bitmask = get_bitmask(key)
-
-            for i in range(Input.KEY_Q, Input.KEY_P + 1):
-                if not test_bit(i, bitmask):
-                    break
-            else:
-                return "KEYBOARD"
-
-            if test_bit(Input.BTN_TOUCH, bitmask):
-                return "TOUCH"
-
-            if test_bit(Input.BTN_MOUSE, bitmask):
-                return "MOUSE"
-
         if "DEVTYPE" in self._environment:
             devtype = self._environment["DEVTYPE"]
             if devtype == "disk":
@@ -181,8 +223,10 @@
                     return "FLOPPY"
 
             if devtype == "scsi_device":
-                type = int(self._attributes.get("type", "-1"))
-                # Check for FLASH drives, see /lib/udev/rules.d/80-udisks.rules
+                match = SCSI_RE.match(self._environment.get("MODALIAS", ""))
+                type = int(match.group("type"), 16) if match else -1
+
+                # Check FLASH drives, see /lib/udev/rules.d/80-udisks.rules
                 if type in (0, 7, 14) \
                    and not any(d.driver == "rts_pstor" for d in self._stack):
                     return "DISK"
@@ -216,8 +260,11 @@
         if "DRIVER" in self._environment:
             return self._environment["DRIVER"]
 
-        if "ID_USB_DRIVER" in self._environment:
-            return self._environment["ID_USB_DRIVER"]
+        # Check parent device for driver
+        if self._stack:
+            parent = self._stack[-1]
+            if "DRIVER" in parent._environment:
+                return parent._environment["DRIVER"]
 
         return None
 
@@ -228,48 +275,36 @@
     @property
     def product_id(self):
         # pci
-        if "PCI_ID" in self._environment:
-            vendor_id, product_id = self._environment["PCI_ID"].split(":")
-            return int(product_id, 16)
-
-        # usb interface
-        if "PRODUCT" in self._environment \
-           and self._environment.get("DEVTYPE") == "usb_interface":
-            vendor_id, product_id, revision \
-                = self._environment["PRODUCT"].split("/")
-            return int(product_id, 16)
-
-        # usb device and ieee1394
-        for attribute in "idProduct", "model_id":
-            if attribute in self._attributes:
-                return int(self._attributes[attribute], 16)
+        match = PCI_RE.match(self._environment.get("MODALIAS", ""))
+        if match:
+            return int(match.group("product_id"), 16)
+
+        # usb
+        match = USB_RE.match(self._environment.get("MODALIAS", ""))
+        if match:
+            return int(match.group("product_id"), 16)
 
         # pnp
-        if "id" in self._attributes:
-            match = re.match(r"^(?P<vendor_name>.*)(?P<product_id>[%s]{4})$"
-                % string.hexdigits, self._attributes["id"])
-            if match:
-                return int(match.group("product_id"), 16)
+        match = PNP_RE.match(self._environment.get("MODALIAS", ""))
+        if match:
+            product_id = int(match.group("product_id"), 16)
+            # Ignore interrupt controllers
+            if product_id > 0x0100:
+                return product_id
 
         return None
 
     @property
     def vendor_id(self):
         # pci
-        if "PCI_ID" in self._environment:
-            vendor_id, product_id = self._environment["PCI_ID"].split(":")
-            return int(vendor_id, 16)
-
-        # usb interface
-        if "PRODUCT" in self._environment \
-           and self._environment.get("DEVTYPE") == "usb_interface":
-            vendor_id, product_id, revision \
-                = self._environment["PRODUCT"].split("/")
-            return int(vendor_id, 16)
-
-        # usb device
-        if "idVendor" in self._attributes:
-            return int(self._attributes["idVendor"], 16)
+        match = PCI_RE.match(self._environment.get("MODALIAS", ""))
+        if match:
+            return int(match.group("vendor_id"), 16)
+
+        # usb
+        match = USB_RE.match(self._environment.get("MODALIAS", ""))
+        if match:
+            return int(match.group("vendor_id"), 16)
 
         return None
 
@@ -299,16 +334,19 @@
             if element in self._environment:
                 return self._environment[element].strip('"')
 
-        for attribute in ("description",
-                          "model_name_kv",
-                          "model",
-                          "product_name"):
-            if attribute in self._attributes:
-                return self._attributes[attribute]
+        # disk
+        if self._environment.get("DEVTYPE") == "scsi_device":
+            for device in reversed(self._stack):
+                if device._environment.get("ID_BUS") == "usb":
+                    return decode_id(device._environment["ID_MODEL_ENC"])
+
+        if self._environment.get("DEVTYPE") == "disk" \
+           and self._environment.get("ID_BUS") == "ata":
+            return decode_id(self._environment["ID_MODEL_ENC"])
 
         # floppy
         if self.driver == "floppy":
-            return "Platform Device"
+            return u"Platform Device"
 
         return None
 
@@ -320,168 +358,28 @@
         if "POWER_SUPPLY_MANUFACTURER" in self._environment:
             return self._environment["POWER_SUPPLY_MANUFACTURER"]
 
-        if "vendor" in self._attributes:
-            vendor = self._attributes["vendor"]
-            if not re.match(r"^0x[%s]{4}$" % string.hexdigits, vendor):
-                return vendor
-
-        # dmi
-        if "sys_vendor" in self._attributes:
-            return self._attributes["sys_vendor"]
-
         # pnp
-        if "id" in self._attributes:
-            match = re.match(r"^(?P<vendor_name>.*)(?P<product_id>[%s]{4})$"
-                % string.hexdigits, self._attributes["id"])
-            if match:
-                return match.group("vendor_name")
-
-        return None
-
-
-class UdevLocalDevice(UdevDevice):
-
-    @property
-    def bus(self):
-        sys_path = posixpath.join(
-            "/sys%s" % self._environment["DEVPATH"], "subsystem")
-        if posixpath.islink(sys_path):
-            link = os.readlink(sys_path)
-            if "/" in link:
-                return posixpath.basename(link)
-
-        return None
-
-    @property
-    def vendor_id(self):
-        vendor_id = super(UdevLocalDevice, self).vendor_id
-        if vendor_id is not None:
-            return vendor_id
-
-        # ieee1394
-        vendor_id_path = posixpath.join(self.path, "../vendor_id")
-        if posixpath.exists(vendor_id_path):
-            vendor_id = open(vendor_id_path, "r").read().strip()
-            return int(vendor_id, 16)
-
-        return None
-
-    @property
-    def product(self):
-        product = super(UdevLocalDevice, self).product
-        if product is not None:
-            return product
-
-        # sound
-        bus = self.bus
-        if bus == "sound":
-            device = posixpath.basename(self._environment["DEVPATH"])
-            match = re.match(
-                r"(card|controlC|hwC|midiC)(?P<card>\d+)", device)
-            if match:
-                card = match.group("card")
-                in_card = False
-                file = open("/proc/asound/cards", "r")
-                for line in file.readlines():
-                    line = line.strip()
-                    match = re.match(r"(?P<card>\d+) \[", line)
-                    if match:
-                        in_card = match.group("card") == card
-
-                    if in_card:
-                        match = re.match(r"""(?P<name>.*) """
-                            """at (?P<address>0x[%s]{8}) """
-                            """irq (?P<irq>\d+)""" % string.hexdigits, line)
-                        if match:
-                            return match.group("name")
-
-            path = None
-            match = re.match(
-                r"pcmC(?P<card>\d+)D(?P<device>\d+)(?P<type>\w)", device)
-            if match:
-                path = "/proc/asound/card%s/pcm%s%c/info" % match.groups()
-
-            match = re.match(
-                r"(dsp|adsp|midi|amidi|audio|mixer)(?P<card>\d+)?", device)
-            if match:
-                card = match.group("card") or 0
-                path = "/proc/asound/card%s/pcm0p/info" % card
-
-            if path and posixpath.exists(path):
-                file = open(path, "r")
-                for line in file.readlines():
-                    match = re.match(r"name: (?P<name>.*)", line)
-                    if match:
-                        return match.group("name")
-
-        return None
-
-    @property
-    def vendor(self):
-        vendor = super(UdevLocalDevice, self).vendor
-        if vendor is not None:
-            return vendor
-
-        # ieee1394
-        vendor_path = posixpath.join(self.path, "../vendor_oui")
-        if posixpath.exists(vendor_path):
-            return open(vendor_path, "r").read().strip()
-
-        return None
-
-
-class UdevDmiDevice(UdevDevice):
-
-    def __init__(self, environment, attributes, category):
-        super(UdevDmiDevice, self).__init__(environment, attributes)
-        self._category = category
-
-    @property
-    def category(self):
-        return self._category
-
-    @property
-    def path(self):
-        path = super(UdevDmiDevice, self).path
-        return posixpath.join(path, self._category.lower())
-
-    @property
-    def product(self):
-        if self._category == "CHASSIS":
-            type_string = self._attributes.get("chassis_type", "0")
-            type_index = int(type_string)
-            return Dmi.chassis_names[type_index]
-
-        for name in "name", "version":
-            attribute = "%s_%s" % (self._category.lower(), name)
-            product = self._attributes.get(attribute)
-            if product and product != "Not Available":
-                return product
-
-        return None
-
-    @DmiNotAvailable
-    def _getVendor(self):
-        attribute = "%s_vendor" % self._category.lower()
-        if attribute in self._attributes:
-            return self._attributes[attribute]
-
-        return None
-
-    @property
-    def vendor(self):
-        return self._getVendor()
-
-
-class UdevParser(object):
-    """udevadm parser."""
-
-    device_factory = UdevDevice
-    dmi_device_factory = UdevDmiDevice
-
-    def __init__(self, stream):
+        match = PNP_RE.match(self._environment.get("MODALIAS", ""))
+        if match:
+            return match.group("vendor_name")
+
+        # disk
+        if self._environment.get("DEVTYPE") == "scsi_device":
+            for device in reversed(self._stack):
+                if device._environment.get("ID_BUS") == "usb":
+                    return decode_id(device._environment["ID_VENDOR_ENC"])
+
+        return None
+
+
+class UdevadmParser:
+    """Parser for the udevadm command."""
+
+    device_factory = UdevadmDevice
+
+    def __init__(self, stream, bits=None):
         self.stream = stream
-        self.stack = []
+        self.bits = bits
 
     def _ignoreDevice(self, device):
         # Ignore devices without bus information
@@ -499,9 +397,8 @@
              and device.subvendor_id is None)):
             return True
 
-        # Ignore virtual devices except for dmi information
-        if device.bus != "dmi" \
-           and "virtual" in device.path.split(posixpath.sep):
+        # Ignore ACPI devices
+        if device.bus == "acpi":
             return True
 
         return False
@@ -510,96 +407,60 @@
         return {}
 
     def run(self, result):
-        line_pattern = re.compile(r"(?P<key>\w):\s*(?P<value>.*)")
+        # Some attribute lines have a space character after the
+        # ':', others don't have it (see udevadm-info.c).
+        line_pattern = re.compile(r"(?P<key>[A-Z]):\s*(?P<value>.*)")
         multi_pattern = re.compile(r"(?P<key>[^=]+)=(?P<value>.*)")
 
+        stack = []
         output = self.stream.read()
-        for record in output.split("\n\n"):
+        for record in re.split("\n{2,}", output):
+            record = record.strip()
             if not record:
                 continue
 
             # Determine path and environment
             path = None
+            element = None
             environment = {}
             for line in record.split("\n"):
-                if not line:
+                line_match = line_pattern.match(line)
+                if not line_match:
+                    if environment:
+                        # Append to last environment element
+                        environment[element] += line
                     continue
 
-                match = line_pattern.match(line)
-                if not match:
-                    raise Exception(
-                        "Device line not supported: %s" % line)
-
-                key = match.group("key")
-                value = match.group("value")
+                key = line_match.group("key")
+                value = line_match.group("value")
 
                 if key == "P":
                     path = value
                 elif key == "E":
-                    match = multi_pattern.match(value)
-                    if not match:
+                    key_match = multi_pattern.match(value)
+                    if not key_match:
                         raise Exception(
                             "Device property not supported: %s" % value)
-                    environment[match.group("key")] = match.group("value")
+                    element = key_match.group("key")
+                    environment[element] = key_match.group("value")
 
             # Update stack
-            while self.stack:
-                if self.stack[-1].path + "/" in path:
+            while stack:
+                if stack[-1].path + "/" in path:
                     break
-                self.stack.pop()
+                stack.pop()
 
             # Set default DEVPATH
             environment.setdefault("DEVPATH", path)
 
-            # Determine attributes
-            attributes = self.getAttributes(path)
-
-            if path == "/devices/virtual/dmi/id":
-                device = self.device_factory(environment, attributes)
-                if not self._ignoreDevice(device):
-                    result.addDevice(device)
-                for category in "BIOS", "BOARD", "CHASSIS":
-                    device = self.dmi_device_factory(
-                        environment, attributes, category)
-                    if not self._ignoreDevice(device):
-                        result.addDevice(device)
-            else:
-                device = self.device_factory(environment, attributes, self.stack)
-                if not self._ignoreDevice(device):
-                    result.addDevice(device)
-
-            self.stack.append(device)
-
-
-class UdevLocalParser(UdevParser):
-
-    device_factory = UdevLocalDevice
-
-    def getAttributes(self, path):
-        attributes = {}
-        sys_path = "/sys%s" % path
-        try:
-            names = os.listdir(sys_path)
-        except OSError:
-            return attributes
-
-        for name in names:
-            name_path = posixpath.join(sys_path, name)
-            if name[0] == "." \
-               or name in ["dev", "uevent"] \
-               or posixpath.isdir(name_path) \
-               or posixpath.islink(name_path):
-                continue
-
-            try:
-                value = open(name_path, "r").read().strip()
-            except IOError:
-                continue
-
-            value = value.split("\n")[0]
-            if [c for c in value if not isprint(c)]:
-                continue
-
-            attributes[name] = value
-
-        return attributes
+            device = self.device_factory(environment, self.bits, list(stack))
+            if not self._ignoreDevice(device):
+                result.addDevice(device)
+
+            stack.append(device)
+
+
+def decode_id(id):
+    encoded_id = id.encode("utf-8")
+    decoded_id = encoded_id.decode("string-escape").decode("utf-8")
+    return decoded_id.strip()
 
=== modified file 'checkbox_cli/cli_interface.py'
--- checkbox_cli/cli_interface.py	2011-06-13 14:22:39 +0000
+++ checkbox_cli/cli_interface.py	2011-11-18 18:04:27 +0000
@@ -145,7 +145,15 @@
 
     def add_option(self, option, key=None):
         if key is None:
-            for key in option.lower()+string.lowercase:
+            keys = option.lower() + \
+                   string.ascii_letters + \
+                   string.digits + \
+                   string.punctuation
+
+            keys = keys.replace(' ','')
+            keys = keys.replace('+', '')
+
+            for key in keys:
                 if key not in self.keys:
                     break
         self.keys.append(key)
 
=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2011-09-29 13:12:01 +0000
+++ checkbox_gtk/gtk_interface.py	2011-11-18 18:04:27 +0000
@@ -102,10 +102,8 @@
             image_head.connect("expose-event",self.draw_image_head)
 
         # Set wait transient for dialog
-        self._wait = self._get_widget("window_wait")
-        self._wait.set_transient_for(self._dialog)
-        self._wait.realize()
-        self._wait.get_window().set_functions(Gdk.WMFunction.MOVE)
+        self._wait = self._get_widget("box_wait")
+        self._wait.hide()
 
         # Set shorthand for notebook
         self._notebook = self._get_widget("notebook_main")
@@ -539,6 +537,8 @@
         test["data"] = self._get_text_view("text_view_comment")
         test["status"] = self._get_radio_button(BUTTON_TO_STATUS)
 
+        self._set_main_title()
+
     def show_info(self, text, options=[], default=None):
         message_dialog = Gtk.MessageDialog(parent=self._dialog,
             type=Gtk.MessageType.INFO,
 
=== modified file 'data/whitelists/default.whitelist'
--- data/whitelists/default.whitelist	2011-09-29 13:12:01 +0000
+++ data/whitelists/default.whitelist	2011-11-18 18:04:27 +0000
@@ -1,6 +1,7 @@
 cdimage
 cpuinfo
 device
+dmi
 dpkg
 gconf
 lsb
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-09-29 13:12:01 +0000
+++ debian/changelog	2011-11-18 18:04:27 +0000
@@ -1,3 +1,62 @@
+checkbox (0.13) precise; urgency=low
+
+  New upstream release (LP: #892268):
+
+  [Marc Tardif]
+  * Generate a submission.xml file that contains all device and attachment
+  * Write the report before reporting the validation error.
+  * Changed device.product to dmi.product for the formfactor (LP: #875312)
+
+  [Daniel Manrique]
+  * Use gettext for string (LP: #869267)
+  * Move progress indicator to main checkbox dialog instead of a 
+    transient window (LP: #868995)
+  * Ignore malformed dpkg entries in package_resource (LP: #794747)
+  * Reset window title after finishing a manual test (LP: #874690)
+  * Handle "@" in locale names (as in ca@valencia).
+
+  [Jeff Lane]
+  * Went through all the job files and:
+    * Updated descriptions to match Unity UI structure
+    * Added descriptions where necessary
+    * Added further details to some descriptions
+    * Moved some jobs to more appropriate files
+    * Fixed job names in older job files to match new naming scheme 
+      (suite/testname)
+    * Added jobs to local.txt to ensure all job files are now parsed
+      (this allows easier addition of existing tests to whitelists)
+    * Changed remaining manual job descriptions to match the new format
+  * Updated CD and DVD write tests to be more clear about when to skip
+    them (LP: #772794)
+
+  [Ara Pulido]
+  * Rewrote all job descriptions to match OEM QA syntax
+
+  [Brendan Donegan]  
+  * Fix the code that assigns keys in checkbox-cli so that it never assigns
+    keys which have other uses. (LP: #877467)
+  * Show details of unmet job requirements (LP: #855852)
+  * Ensure that connect_wireless chooses a wireless connection from the list
+    of available connections (LP: #877752)
+  * Have the bluetooth/detect tests require a device with the category
+    BLUETOOTH to run, thus preventing the test from failing on systems with
+    no Bluetooth device (LP: #862322)
+  * Rename attachment jobs to not have a forward slash in their name
+    (LP: #887964)
+  * Guard against trying to write files to logical partitions on USB sticks
+    (which will obviously fail) in usb_test (LP: #887049)
+  * Make the OpenGL test ignore the return value of glxgears and improve
+    the test description (LP: #890725)
+  * Allow input/mouse test to run if a TOUCH device is present
+    (LP: #886129)
+
+  [ Javier Collado ]
+  * Broken job dependencies fixed (LP: #888447)
+  * Regex support when specifying blacklists and whitelists on the
+    commandline (LP: #588647)
+
+ -- Daniel Manrique <[e-mail]>  Thu, 18 Nov 2011 12:46:21 -0500
+
 checkbox (0.12.8) oneiric; urgency=low
 
   New upstream release (LP: #862579):
 
=== added file 'debian/po/ro.po'
--- debian/po/ro.po	1970-01-01 00:00:00 +0000
+++ debian/po/ro.po	2011-11-18 18:04:27 +0000
@@ -0,0 +1,118 @@
+# Romanian translation for checkbox
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the checkbox package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: checkbox\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"PO-Revision-Date: 2011-10-27 20:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-10-28 05:11+0000\n"
+"X-Generator: Launchpad (build 14197)\n"
+
+#. Type: boolean
+#. Description
+#: ../checkbox.templates:1001
+msgid "Enable bug reporting by default? "
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../checkbox.templates:1001
+msgid ""
+"If this option is set to Yes, then checkbox will ask if the user wants to "
+"file a bug for failing tests, even if apport is not enabled."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:2001
+msgid "Default package to report bugs against:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:2001
+msgid ""
+"When filing a new bug through checkbox, if it does not guess the  package, "
+"the default package that the bug will be file against."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:3001
+msgid "Test suite blacklist:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:3001
+msgid "List of job files to never run when testing with checkbox."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:4001
+msgid "Test suite whitelist:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:4001
+msgid "List of jobs to run when testing with checkbox."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:5001
+msgid "Transport URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:5001
+msgid "URL where to send submissions."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:6001
+msgid "Launchpad E-mail:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:6001
+msgid "E-mail address used to sign in to Launchpad."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:7001
+msgid "HTTP Proxy:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:7001
+msgid "HTTP proxy to use instead of the one specified in environment."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:8001
+msgid "HTTPS Proxy:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:8001
+msgid "HTTPS proxy to use instead of the one specified in environment."
+msgstr ""
 
=== modified file 'examples/checkbox.ini'
--- examples/checkbox.ini	2010-03-09 16:58:36 +0000
+++ examples/checkbox.ini	2011-11-18 18:04:27 +0000
@@ -22,5 +22,5 @@
 [checkbox/plugins/jobs_info]
 
 # Blacklist of jobs that are potentially dangerous
-blacklist = autotest ltp phoronix qa-regression-testing
+blacklist = autotest/full_suite ltp phoronix qa-regression-testing
   clone06.1 ioctl03.1 lchown02.* swapon03.1
 
=== modified file 'gtk/checkbox-gtk.ui'
--- gtk/checkbox-gtk.ui	2011-06-13 14:22:39 +0000
+++ gtk/checkbox-gtk.ui	2011-11-18 18:04:27 +0000
@@ -374,6 +374,43 @@
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox" id="box_wait">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel" id="label_wait">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="progressbar_wait">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pulse_step">0.10000000149</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+
+
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area">
             <property name="visible">True</property>
@@ -452,41 +489,4 @@
       <action-widget response="1">button_next</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="window_wait">
-    <property name="title" translatable="yes"></property>
-    <property name="border_width">6</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox_wait">
-        <property name="visible">True</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="label_wait">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkProgressBar" id="progressbar_wait">
-            <property name="visible">True</property>
-            <property name="pulse_step">0.10000000149</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
 </interface>
 
=== removed file 'jobs/apport.txt.in'
--- jobs/apport.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/apport.txt.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-plugin: shell
-name: apport-directory
-requires: package.name == 'apport'
-command: ! test -d /var/crash || test $(find /var/crash -type f | wc -l) -eq 0
-_description: Test that the /var/crash directory doesn't contain anything.
 
=== modified file 'jobs/audio.txt.in'
--- jobs/audio.txt.in	2011-09-01 12:23:07 +0000
+++ jobs/audio.txt.in	2011-11-18 18:04:27 +0000
@@ -1,15 +1,10 @@
-plugin: manual
+plugin: shell 
 name: audio/list_devices
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base'
 command: cat /proc/asound/cards
-_description:
- Detecting your sound device(s):
- .
- $output
- .
- Is this correct?
+_description: Test to detect audio devices
 
 plugin: manual
 name: audio/playback_auto
@@ -19,9 +14,14 @@
  package.name == 'alsa-base' and package.name == 'python-gst0.10'
 command: gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'
 _description:
- Select Test to play a sound on the automatically detected playback device.
- .
- Did you hear a sound and was that sound free of any distortion, clicks or other strange noises?
+ PURPOSE:
+     This test will check that internal speakers work correctly
+ STEPS:
+     1. Make sure that no external speakers or headphones are connected
+        If testing a desktop, external speakers are allowed
+     2. Click the Test button to play a brief tone on your audio device
+ VERIFICATION:
+     Did you hear a tone?
 
 plugin: manual
 name: audio/playback_headphones
@@ -31,11 +31,13 @@
  package.name == 'alsa-base' and package.name == 'python-gst0.10'
 command: gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'
 _description:
- Please connect a pair of headphones to your audio device.
- .
- Select Test to play a sound on the automatically detected playback device.
- .
- Did you hear a sound through the headphones and did the sound play without any distortion, clicks or other strange noises from your headphones?
+ PURPOSE:
+     This test will check that headphones connector works correctly
+ STEPS:
+     1. Connect a pair of headphones to your audio device
+     2. Click the Test button to play a sound to your audio device
+ VERIFICATION:
+     Did you hear a sound through the headphones and did the sound play without any distortion, clicks or other strange noises from your headphones?
 
 plugin: manual
 name: audio/alsa_record_playback_internal
@@ -45,9 +47,14 @@
  package.name == 'alsa-base'
 command: alsa_record_playback
 _description:
- Disconnect any external microphones that you have plugged in.  Select Test, then speak into your internal microphone.  After a few seconds, your speech will be played back to you.
- .
- Did you hear your speech played back?
+ PURPOSE:
+     This test will check that recording sound using the onboard microphone works correctly
+ STEPS:
+     1. Disconnect any external microphones that you have plugged in
+     2. Click "Test", then speak into your internal microphone
+     3. After a few seconds, your speech will be played back to you.
+ VERIFICATION:
+     Did you hear your speech played back?
 
 plugin: manual
 name: audio/alsa_record_playback_external
@@ -57,9 +64,14 @@
  package.name == 'alsa-base'
 command: alsa_record_playback
 _description:
- Connect a microphone to your microphone port.  Select Test, then speak into the microphone.  After a few seconds, your speech will be played back to you.
- .
- Did you hear your speech played back?
+ PURPOSE:
+     This test will check that recording sound using an external microphone works correctly
+ STEPS:
+     1. Connect a microphone to your microphone port
+     2. Click "Test", then speak into the external microphone
+     3. After a few seconds, your speech will be played back to you
+ VERIFICATION:
+     Did you hear your speech played back?
 
 plugin: manual
 name: audio/alsa_record_playback_usb
@@ -68,9 +80,17 @@
  package.name == 'alsa-base'
 command: alsa_record_playback
 _description:
- Connect a USB audio device to your system.  Then open the volume control application by left-clicking on the speaker icon in the panel and selecting "Sound Preferences".  Select the "Input" tab and choose your USB device.  Select the "Output" tab and choose your USB device.  When you are done, select Test, then speak into the microphone.  After a few seconds, your speech will be played back to you.
- .
- Did you hear your speech played back?
+ PURPOSE:
+     This test will check that a USB audio device works correctly
+ STEPS:
+     1. Connect a USB audio device to your system
+     2. Open the volume control application by left-clicking on the speaker icon in the panel and selecting "Sound Settings"
+     3. Select the "Input" tab and choose your USB device
+     4. Select the "Output" tab and choose your USB device
+     5. Click "Test", then speak into the microphone
+     6. After a few seconds, your speech will be played back to you
+ VERIFICATION:
+     Did you hear your speech played back through the USB headphones?
 
 plugin: shell
 name: audio/alsa_record_playback_automated
 
=== modified file 'jobs/autotest.txt.in'
--- jobs/autotest.txt.in	2010-03-09 16:58:36 +0000
+++ jobs/autotest.txt.in	2011-11-18 18:04:27 +0000
@@ -1,6 +1,8 @@
-name: autotest
+name: autotest/full_suite
 plugin: remote
-_description: Autotest suite (destructive)
 user: root
 timeout: 1200
 command: autotest_suite
+_description:
+ PURPOSE:
+    This test will attempt to install and run the Autotest Suite.  These tests can be destructive, so this test is blacklisted by default.
 
=== modified file 'jobs/bluetooth.txt.in'
--- jobs/bluetooth.txt.in	2011-09-01 12:23:07 +0000
+++ jobs/bluetooth.txt.in	2011-11-18 18:04:27 +0000
@@ -1,88 +1,100 @@
 plugin: shell 
 name: bluetooth/detect
-requires: package.name == 'bluez'
+requires: 
+ package.name == 'bluez'
+ device.category == 'BLUETOOTH'
 command: hcitool dev | tail -n+2 | awk '{print $2}' |grep -E "^([0-9a-fA-F]{2}\:){5}[0-9a-fA-F]{2}$"
 _description:
- Output address of detected Bluetooth device, if any, or exits with error if none is found.
+ This test will detect your Bluetooth device and output the device's hardware address.  If no device is found, the test will exit with an error.
 
 plugin: shell
 name: bluetooth/detect-output
-requires: package.name == 'bluez'
+requires:
+ package.name == 'bluez'
+ device.category == 'BLUETOOTH'
 command: hcitool dev | tail -n+2 | awk '{print $2}'; hcitool dev | tail -n+2 | awk '{print $2}' > $CHECKBOX_DATA/bluetooth_address
 _description:
- Automated test to store output in checkbox report
+ Automated test to store bluetooth device information in checkbox report
 
 plugin: manual
 name: bluetooth/browse-files
 depends: bluetooth/detect
 _description:
- Bluetooth browse files procedure:
- 1.- Enable bluetooth on any mobile device (PDA, smartphone, etc.)
- 2.- Click on the bluetooth icon in the menu bar
- 3.- Select 'Setup new device'
- 3.- Look for the device in the list and select it
- 4.- In the device write the PIN code automatically chosen by the wizard
- 5.- The device should pair with the computer
- 6.- Right-click on the bluetooth icon and select browse files
- 7.- Authorize the computer to browse the files in the device if needed
- 8.- You should be able to browse the files
- .
- Did all the steps work?
+ PURPOSE:
+     This test will check that bluetooth connection works correctly
+ STEPS:
+     1. Enable bluetooth on any mobile device (PDA, smartphone, etc.)
+     2. Click on the bluetooth icon in the menu bar
+     3. Select 'Setup new device'
+     4. Look for the device in the list and select it
+     5. In the device write the PIN code automatically chosen by the wizard
+     6. The device should pair with the computer
+     7. Right-click on the bluetooth icon and select browse files
+     8. Authorize the computer to browse the files in the device if needed
+     9. You should be able to browse the files
+ VERIFICATION:
+     Did all the steps work?
 
 plugin: manual
 name: bluetooth/file-transfer
 depends: bluetooth/browse-files bluetooth/detect
 _description:
- Bluetooth file transfer procedure:
- 1.- Make sure that you're able to browse the files in your mobile device
- 2.- Copy a file from the computer to the mobile device
- 3.- Verify that the file was correctly copied
- 4.- Copy a file from the mobile device to the computer
- 5.- Verify that the file was correctly copied
- .
- Did all the steps work?
+ PURPOSE:
+     This test will check that you can transfer information through a bluetooth connection
+ STEPS:
+     1. Make sure that you're able to browse the files in your mobile device
+     2. Copy a file from the computer to the mobile device
+     3. Copy a file from the mobile device to the computer
+ VERIFICATION:
+     Were all files copied correctly?
 
 plugin: manual
 name: bluetooth/audio
 depends: bluetooth/detect
-requires: package.name == 'alsa-utils'
 command: arecord -d 5 -D bluetooth -f S16_LE | aplay -D bluetooth -f S16_LE
 _description:
- Bluetooth audio procedure:
- 1.- Enable the bluetooth headset
- 2.- Click on the bluetooth icon in the menu bar
- 3.- Select 'Setup new device'
- 4.- Look for the device in the list and select it
- 5.- In the device write the PIN code automatically chosen by the wizard
- 6.- The device should pair with the computer
- 7.- Select Test to record for five seconds and reproduce in the bluetooth device
- .
- Did all the steps work?
+ PURPOSE:
+     This test will check that you can record and hear audio using a bluetooth audio device
+ STEPS:
+     1. Enable the bluetooth headset
+     2. Click on the bluetooth icon in the menu bar
+     3. Select 'Setup new device'
+     4. Look for the device in the list and select it
+     5. In the device write the PIN code automatically chosen by the wizard
+     6. The device should pair with the computer
+     7. Click "Test" to record for five seconds and reproduce in the bluetooth device
+ VERIFICATION:
+     Did you hear the sound you recorded in the bluetooth
 
 plugin: manual
 name: bluetooth/keyboard
 command: keyboard_test
 depends: bluetooth/detect
 _description:
- Bluetooth keyboard procedure:
- 1.- Enable the bluetooth keyboard
- 2.- Click on the bluetooth icon in the menu bar
- 3.- Select 'Setup new device'
- 4.- Look for the device in the list and select it
- 5.- Select Test to enter text
- .
- Did all the steps work?
+ PURPOSE:
+     This test will check that you can use a bluetooth keyboard
+ STEPS:
+     1. Enable the bluetooth keyboard
+     2. Click on the bluetooth icon in the menu bar
+     3. Select 'Setup new device'
+     4. Look for the device in the list and select it
+     5. Click "Test"
+     6. Enter some text
+ VERIFICATION:
+     Were you able to enter some text with the bluetooth keyboard?
 
 plugin: manual
 name: bluetooth/mouse
 depends: bluetooth/detect
 _description:
- Bluetooth mouse procedure:
- 1.- Enable the bluetooth mouse
- 2.- Click on the bluetooth icon in the menu bar
- 3.- Select 'Setup new device'
- 4.- Look for the device in the list and select it
- 5.- Move the mouse around the screen
- 6.- Perform some single/double/right click operations
- .
- Did all the steps work?
+ PURPOSE:
+     This test will check that you can use a bluetooth mouse
+ STEPS:
+     1. Enable the bluetooth mouse
+     2. Click on the bluetooth icon in the menu bar
+     3. Select 'Setup new device'
+     4. Look for the device in the list and select it
+     5. Move the mouse around the screen
+     6. Perform some single/double/right click operations
+ VERIFICATION:
+     Did the mouse work as expected?
 
=== modified file 'jobs/camera.txt.in'
--- jobs/camera.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/camera.txt.in	2011-11-18 18:04:27 +0000
@@ -4,7 +4,7 @@
  package.name == 'xawtv'
  device.category == 'CAPTURE'
 command: camera_test -t detect
-_description: Automated test case that attempts to detect a camera
+_description: This Automated test attempts to detect a camera.
 
 plugin: manual
 name: camera/display
@@ -14,9 +14,12 @@
  device.category == 'CAPTURE'
 command: camera_test -t display
 _description:
- Select Test to display a video capture from the camera
- .
- Did you see the video capture?
+ PURPOSE:
+     This test will check that the built-in camera works
+ STEPS:
+     1. Click on Test to display a video capture from the camera
+ VERIFICATION:
+     Did you see the video capture?
 
 plugin: manual
 name: camera/still
@@ -28,9 +31,12 @@
  device.category == 'CAPTURE'
 command: camera_test -t still
 _description:
- Select Test to display a still image from the camera
- .
- Did you see the image?
+ PURPOSE:
+     This test will check that the built-in camera works
+ STEPS:
+     1. Click on Test to display a still image from the camera
+ VERIFICATION:
+     Did you see the image?
 
 plugin: manual
 name: camera/video
@@ -41,8 +47,9 @@
  device.category == 'CAPTURE'
 command: camera_test -t video
 _description:
- Select Test to capture video to a file and open it in totem.
- Please make sure that both audio and video is captured.
- .
- Did you see/hear the capture?
-
+ PURPOSE:
+     This test will check that you can capture video with the built-in camera
+ STEPS:
+     1. Click on Test to capture video to a file (it will automatically open in Totem)
+ VERIFICATION:
+     Did you see and hear the capture?
 
=== modified file 'jobs/codecs.txt.in'
--- jobs/codecs.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/codecs.txt.in	2011-11-18 18:04:27 +0000
@@ -1,51 +1,29 @@
 plugin: manual
-name: codecs-ogg-vorbis
+name: codecs/ogg-vorbis
 requires:
  package.name == 'gstreamer0.10-plugins-base'
  package.name == 'totem' and package.name == 'ubuntu-sounds'
 command: totem /usr/share/sounds/ubuntu/stereo/system-ready.ogg
 _description:
- Select Test to play an Ogg Vorbis file (.ogg)
- .
- (Please close Movie Player to proceed.)
- .
- Did the sample play correctly?
+ PURPOSE:
+    This test will verify your system's ability to play Ogg Vorbis audio files.
+ STEPS:
+    1. Click Test to play an Ogg Vorbis file (.ogg)
+    2. Please close the player to proceed.
+ VERIFICATION:
+    Did the sample play correctly?
 
 plugin: manual
-name: codecs-wav
+name: codecs/wav
 requires:
  package.name == 'gstreamer0.10-plugins-good'
  package.name == 'totem' and package.name == 'alsa-utils'
 command: totem /usr/share/sounds/alsa/Noise.wav
 _description:
- Select Test to play a Wave Audio format file (.wav)
- .
- (Please close Movie Player to proceed.)
- .
- Did the sample play correctly?
-
-plugin: manual
-name: media-pause-audio
-requires:
- package.name == 'totem'
- package.name == 'gstreamer0.10-plugins-base'
-command: totem $CHECKBOX_SHARE/data/FrustrationBlues-ColinRoss.oga
-_description:
- Select 'Test' to play some audio, and try pausing and resuming playback while the it is playing.
- .
- (Please close Movie Player to proceed.)
- .
- Did the audio play and pause as expected?
-
-plugin: manual
-name: media-pause-video
-requires:
- package.name == 'totem'
- package.name == 'gstreamer0.10-plugins-base'
-command: totem $CHECKBOX_SHARE/data/UbuntuIsHumanity.ogv
-_description:
- Select 'Test' to play a video, and try pausing and resuming playback while the video is playing.
- .
- (Please close Movie Player to proceed.)
- .
- Did the video play and pause as expected?
+ PURPOSE:
+    This test will verify your system's ability to play Wave Audio files.
+ STEPS:
+    1. Select Test to play a Wave Audio format file (.wav)
+    2. Please close the player to proceed.
+ VERIFICATION:
+    Did the sample play correctly?
 
=== modified file 'jobs/cpu.txt.in'
--- jobs/cpu.txt.in	2011-08-10 21:09:56 +0000
+++ jobs/cpu.txt.in	2011-11-18 18:04:27 +0000
@@ -6,7 +6,7 @@
 user: root
 command: fwts_test -c -l $CHECKBOX_DATA/cpu_scaling_test.log
 _description:
- Test the CPU scaling capabilities using Colin King's Firmware Test Suite tool.
+ Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq).
 
 plugin: shell
 name: cpu/clocktest
@@ -28,7 +28,7 @@
 requires: int(cpuinfo.count) > 1 and (cpuinfo.platform == 'i386' or cpuinfo.platform == 'x86_64')
 command: cpu_topology
 _description:
- Checks cpu topology for accuracy
+ This test checks cpu topology for accuracy
 
 plugin: shell
 name: cpu/frequency_governors
@@ -36,4 +36,4 @@
 user: root
 command: nice -n -20 cpu_scaling_test 
 _description:
- Checks that CPU frequency governors are obeyed when set.
+ This test checks that CPU frequency governors are obeyed when set.
 
=== modified file 'jobs/daemons.txt.in'
--- jobs/daemons.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/daemons.txt.in	2011-11-18 18:04:27 +0000
@@ -1,59 +1,59 @@
 plugin: shell
-name: atd
+name: daemons/atd
 requires: package.name == 'at'
 command: pgrep -f '/usr/sbin/atd' >/dev/null
 _description: Test if the atd daemon is running when the package is installed.
 
 plugin: shell
-name: cron
+name: daemons/cron
 requires: package.name == 'cron'
 command: pgrep -f '/usr/sbin/cron' >/dev/null
 _description: Test if the cron daemon is running when the package is installed.
 
 plugin: shell
-name: cupsd
+name: daemons/cupsd
 requires: package.name == 'cupsys'
 command: pgrep -f '/usr/sbin/cupsd' >/dev/null
 _description: Test if the cupsd daemon is running when the package is installed.
 
 plugin: shell
-name: getty
+name: daemons/getty
 requires: package.name == 'util-linux'
 command: pgrep -f '/sbin/getty' >/dev/null
 _description: Test if the getty daemon is running when the package is installed.
 
 plugin: shell
-name: init
+name: daemons/init
 requires: package.name == 'upstart'
 command: pgrep -f '/sbin/init' >/dev/null
 _description: Test if the init daemon is running when the package is installed.
 
 plugin: shell
-name: klogd
+name: daemons/klogd
 requires: package.name == 'klogd'
 command: pgrep -f '/sbin/klogd' >/dev/null
 _description: Test if the klogd daemon is running when the package is installed.
 
 plugin: shell
-name: nmbd
+name: daemons/nmbd
 requires: package.name == 'samba'
 command: pgrep -f '/usr/sbin/nmbd' >/dev/null
 _description: Test if the nmbd daemon is running when the package is installed.
 
 plugin: shell
-name: smbd
+name: daemons/smbd
 requires: package.name == 'samba'
 command: pgrep -f '/usr/sbin/smbd' >/dev/null
 _description: Test if the smbd daemon is running when the package is installed.
 
 plugin: shell
-name: syslogd
+name: daemons/syslogd
 requires: package.name == 'syslogd'
 command: pgrep -f '/sbin/syslogd' >/dev/null
 _description: Test if the syslogd daemon is running when the package is installed.
 
 plugin: shell
-name: udevd
+name: daemons/udevd
 requires:
  package.name == 'udevd'
  package.name == 'linux'
@@ -61,7 +61,7 @@
 _description: Test if the udevd daemon is running when the package is installed.
 
 plugin: shell
-name: winbindd
+name: daemons/winbindd
 requires: package.name == 'winbind'
 command: pgrep -f '/usr/sbin/winbindd' >/dev/null
 _description: Test if the winbindd daemon is running when the package is installed.
 
=== modified file 'jobs/disk.txt.in'
--- jobs/disk.txt.in	2011-09-14 21:16:02 +0000
+++ jobs/disk.txt.in	2011-11-18 18:04:27 +0000
@@ -14,7 +14,7 @@
  requires: device.path == "$path" and package.name == 'linux'
  user: root
  command: hdparm -tT /dev/`ls /sys$path/block` | sed 's/:.*= */ = /' | grep -v "^$"
- description: Benchmark for $path 
+ description: This test runs hdparm timing tests as a benchmark for $path 
  EOF
 
 plugin: local
@@ -29,7 +29,8 @@
  plugin: shell
  name: disk/smart_`ls /sys$path/block`
  requires: device.path == "$path"
- description: SMART test for $product
+ description: 
+  This tests the SMART capabilities for $product (Note that this test will not work against removable media (USB, Firewire) and hardware RAID)
  user: root
  command: disk_smart -b /dev/`ls /sys$path/block` -s 130
  EOF
@@ -44,7 +45,7 @@
  plugin: shell
  name: disk/max_diskspace_used_`ls /sys$path/block`
  requires: device.path == "$path"
- description: Max disk space test for $product
+ description: Maximum disk space test for $product
  user: root
  command: max_diskspace_used `ls /sys$path/block`
  EOF
@@ -61,7 +62,7 @@
  requires:
   device.path == "$path"
   package.name == 'linux'
- description: Disk performance for $product
+ description: Disk performance test for $product
  user: root
  command: disk_read_performance_test `ls /sys$path/block`
  EOF
@@ -79,6 +80,6 @@
  requires:
   device.path == "$path"
   package.name == 'linux'
- description: I/O stress test for $product
+ description: Disk I/O stress test for $product
  command: storage_test `ls /sys$path/block`
  EOF
 
=== removed file 'jobs/evolution.txt.in'
--- jobs/evolution.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/evolution.txt.in	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-plugin: manual
-name: applications-evolution-pop3
-requires: package.name == "evolution"
-command: evolution
-_description:
- Click the "Test" button to launch Evolution, then configure it to connect to a POP3 account.
- .
- Were you able to receive and read e-mail correctly?
-
-plugin: manual
-name: applications-evolution-imap
-requires: package.name == "evolution"
-command: evolution
-_description:
- Click the "Test" button to launch Evolution, then configure it to connect to a IMAP account.
- .
- Were you able to receive and read e-mail correctly?
-
-plugin: manual
-name: applications-evolution-smtp
-requires: package.name == "evolution"
-command: evolution
-_description:
- Click the "Test" button to launch Evolution, then configure it to connect to a SMTP account.
- .
- Were you able to send e-mail without errors?
 
=== modified file 'jobs/fingerprint.txt.in'
--- jobs/fingerprint.txt.in	2011-08-10 21:09:56 +0000
+++ jobs/fingerprint.txt.in	2011-11-18 18:04:27 +0000
@@ -1,27 +1,31 @@
 plugin: manual
 name: fingerprint/login
 _description:
- Prerequisites: This test case assumes that there's a testing account from which test cases are run and a personal account that the tester uses to verify the fingerprint reader
- .
- Fingerprint login verification procedure:
-  1.- Click on the user switcher applet.
-  2.- Select your user name.
-  3.- A window should appear that provides the ability to login either typing your password or using fingerprint authentication.
-  4.- Use the fingerprint reader to login.
-  5.- Click on the user switcher applet.
-  6.- Select the testing account to continue running tests.
- .
- Did the authentication procedure work correctly?
+ PURPOSE:
+    This test will verify that a fingerprint reader will work properly for logging into your system.
+ PREREQUISITES:
+    This test case assumes that there's a testing account from which test cases are run and a personal account that the tester uses to verify the fingerprint reader
+ STEPS:
+    1. Click on the user switcher applet.
+    2. Select your user name.
+    3. A window should appear that provides the ability to login either typing your password or using fingerprint authentication.
+    4. Use the fingerprint reader to login.
+    5. Click on the user switcher applet.
+    6. Select the testing account to continue running tests.
+ VERIFICATION:
+    Did the authentication procedure work correctly?
 
 plugin: manual
 name: fingerprint/unlock
 _description:
- Fingerprint unlock verification procedure:
-  1.- Click on the user switcher applet.
-  2.- Select 'Lock screen'.
-  3.- Press any key or move the mouse.
-  4.- A window should appear that provides the ability to unlock either typing your password or using fingerprint authentication.
-  5.- Use the fingerprint reader to unlock.
-  6.- Your screen should be unlocked.
- .
- Did the authentication procedure work correctly?
+ PURPOSE:
+    This test will verify that a fingerprint reader can be used to unlock a locked system.
+ STEPS:
+    1. Click on the user switcher applet.
+    2. Select 'Lock screen'.
+    3. Press any key or move the mouse.
+    4. A window should appear that provides the ability to unlock either typing your password or using fingerprint authentication.
+    5. Use the fingerprint reader to unlock.
+    6. Your screen should be unlocked.
+ VERIFICATION:
+    Did the authentication procedure work correctly?
 
=== modified file 'jobs/firewire.txt.in'
--- jobs/firewire.txt.in	2011-08-10 21:09:56 +0000
+++ jobs/firewire.txt.in	2011-11-18 18:04:27 +0000
@@ -1,11 +1,12 @@
 plugin: manual
 name: firewire/hdd
 _description:
- Firewire HDD verification procedure:
-  1.- Plug a Firewire HDD into the computer.
-  2.- A window should be opened asking which action should be performed (open folder, photo manager, etc).
-  3.- Copy some files from your internal HDD to the firewire HDD.
-  4.- Copy some files from the firewire HDD to your internal HDD.
- .
- Do the copy operations work as expected?
-
+ PURPOSE:
+     This test will check that the firewire port works
+ STEPS:
+     1. Plug a Firewire HDD into the computer
+     2. Either a window asking which action should be performed (open folder, photo manager, etc) or a file browser will open.
+     3. Copy some files from your internal HDD to the firewire HDD
+     4. Copy some files from the firewire HDD to your internal HDD
+ VERIFICATION:
+     Do the copy operations work as expected?
 
=== removed file 'jobs/gcalctool.txt.in'
--- jobs/gcalctool.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/gcalctool.txt.in	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-plugin: manual
-name: applications-gcalctool
-requires: package.name == "gcalctool"
-command: gcalctool
-_description:
- Click the "Test" button to open the calculator.
- .
- Did it launch correctly?
-
-plugin: manual
-name: applications-gcalctool-functions
-depends: applications-gcalctool
-requires: package.name == "gcalctool"
-command: gcalctool
-_description:
- Click the "Test" button to open the calculator and perform:
- .
- 1. Simple math functions (+,-,/,*)
- 2. Nested math functions ((,))
- 3. Fractional math
- 4. Decimal math
- .
- Did the functions perform as expected?
-
-plugin: manual
-name: applications-gcalctool-memory
-depends: applications-gcalctool
-requires: package.name == "gcalctool"
-command: gcalctool
-_description:
- Click the "Test" button to open the calculator and perform:
- .
- 1. Memory set
- 2. Memory reset
- 3. Memory last clear
- 4. Memory clear
- .
- Did the functions perform as expected?
-
-plugin: manual
-name: applications-gcalctool-clipboard
-depends: applications-gcalctool
-requires: package.name == "gcalctool"
-command: gcalctool
-_description:
- Click the "Test" button to open the calculator and perform:
- .
- 1. Cut
- 2. Copy
- 3. Paste
- .
- Did the functions perform as expected?
 
=== removed file 'jobs/gedit.txt.in'
--- jobs/gedit.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/gedit.txt.in	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-plugin: manual
-name: applications-gedit
-requires: package.name == "gedit"
-command: gedit
-_description:
- Click the "Test" button to open gedit.
- .
- Enter some text and save the file (make a note of the file name you use), then close gedit.
- .
- Did this perform as expected?
-
-plugin: manual
-name: applications-gedit-read
-depends: applications-gedit
-requires: package.name == "gedit"
-command: gedit
-_description:
- Click the "Test" button to open gedit, and re-open the file you created previously.
- .
- Edit then save the file, then close gedit.
- .
- Did this perform as expected?
 
=== removed file 'jobs/gnome-terminal.txt.in'
--- jobs/gnome-terminal.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/gnome-terminal.txt.in	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-plugin: manual
-name: applications-gnome-terminal
-requires: package.name == "gnome-terminal"
-command: gnome-terminal
-_description:
- Click the "Test" button to open Terminal.
- .
- Type 'ls' and press enter. You should see a list of files and folder in your home directory.
- .
- Close the terminal window.
- .
- Did this perform as expected?
 
=== modified file 'jobs/graphics.txt.in'
--- jobs/graphics.txt.in	2011-08-10 21:09:56 +0000
+++ jobs/graphics.txt.in	2011-11-18 18:04:27 +0000
@@ -1,12 +1,8 @@
-plugin: manual
+plugin: shell
 name: graphics/xorg-version
 requires: package.name == "x11-utils"
 command: xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
-_description:
- 2d graphics appears to be working, your running X.Org version is:
- $output
- .
- Is this correct?
+_description: Test to output the Xorg version
 
 plugin: shell
 name: graphics/xorg-version-output
@@ -19,41 +15,40 @@
 name: graphics/gtkperf
 depends: graphics/xorg-version-output
 requires: package.name == 'gtkperf'
-command: gtkperf -a
+command: gtkperf -a | grep "Total time:"
 _description:
  Run gtkperf to make sure that GTK based test cases work
- .
- In the future add the returned time as a benchmark result to the checkbox report
 
 plugin: manual
 name: graphics/resolution-change
 depends: graphics/xorg-version-output
 _description:
- Display resolution change procedure:
- 1.- Open System->Preferences->Monitors
- 2.- Select a new resolution from the dropdown list
- 3.- Click on Apply
- 4.- The resolution should change
- 5.- Select the original resolution from the dropdown list
- 6.- Click on Apply
- 7.- The resolution should change again
- .
- Did the resolution change as expected?
+ PURPOSE:
+     This test will verify that the GUI is usable after manually changing resolution
+ STEPS:
+     1. Open the Displays application
+     2. Select a new resolution from the dropdown list
+     3. Click on Apply
+     4. Select the original resolution from the dropdown list
+     5. Click on Apply
+ VERIFICATION:
+     Did the resolution change as expected?
 
 plugin: manual
 name: graphics/rotation
 depends: graphics/xorg-version-output
 _description:
- Display rotation verification procedure:
- 1.- Open System->Preferences->Monitors
- 2.- Select a new rotation value from the dropdown list
- 3.- Click on Apply
- 4.- The display should be rotated according to the new configuration value
- 5.- Click on Restore Previous Configuration
- 6.- The display configuration change should be reverted
- 7.- Repeat 2-6 for different rotation values
- .
- Did the display rotation change as expected?
+ PURPOSE:
+     This test will test display rotation
+ STEPS:
+     1. Open the Displays application
+     2. Select a new rotation value from the dropdown list
+     3. Click on Apply
+     4. Click on Restore Previous Configuration
+     5. Click on Apply
+     6. Repeat 2-5 for different rotation values
+ VERIFICATION:
+     Did the display rotation change as expected?
 
 plugin: shell
 name: graphics/xorg-process
@@ -72,7 +67,7 @@
 requires: package.name == 'xorg' and device.driver == 'i915'
 user: root
 command: xorg_memory_test xeyes
-_description: Test that X does not leak memory when running programs.
+_description: Test that X does not leak memory when running programs on systems with intel based graphics.
 
 plugin: manual
 name: graphics/resolution
@@ -80,11 +75,14 @@
  device.category == 'VIDEO'
 command: resolution_test
 _description:
- This display is using the following resolution:
- .
- $output
- .
- Is this acceptable for your display?
+ PURPOSE:
+     This test will verify the default display resolution
+ STEPS:
+     1. This display is using the following resolution:
+ INFO:
+     $output
+ VERIFICATION:
+     Is this acceptable for your display?
 
 plugin: shell
 name: graphics/minimum_resolution
@@ -102,30 +100,39 @@
 requires: package.name == 'xorg' and package.name == 'python-gst0.10'
 command: gst_pipeline_test -t 2 'videotestsrc ! ffmpegcolorspace ! gconfvideosink'
 _description:
- Select Test to display a video test.
- .
- Do you see color bars and static?
+ PURPOSE:
+     This test will test the default display
+ STEPS:
+     1. Click "Test" to display a video test.
+ VERIFICATION:
+     Do you see color bars and static?
 
 plugin: manual
 name: graphics/xrandr_detect_modes
 requires: package.name == 'xorg'
 command: xrandr
 _description:
- The following screens and video modes have been detected on your system:
- .
- $output
- .
- Is this correct?
+ PURPOSE:
+     This test checks the detected video modes
+ STEPS:
+     1. The following screens and video modes have been detected on your system
+ INFO:
+     $output
+ VERIFICATION:
+     Are those correct?
 
 plugin: manual
 name: graphics/cycle_resolution
 requires: package.name == 'xorg'
-depends: xrandr_detect_modes
+depends: graphics/xrandr_detect_modes
 command: xrandr_cycle
 _description:
- Select Test to cycle through the detected video modes for your system.
- .
- Did the screen appear to be working for each mode?
+ PURPOSE:
+     This test cycles through the detected video modes
+ STEPS:
+     1. Click "Test" to start cycling through the video modes
+ VERIFICATION:
+     Did the screen appear to be working for each mode?
 
 plugin: shell
 name: graphics/compiz_check
@@ -136,8 +143,13 @@
 plugin: manual
 name: graphics/glxgears
 requires: package.name == 'mesa-utils'
-command: glxgears
+command: glxgears; true
 _description:
- Select Test to execute glxgears to ensure that minimal 3d graphics support is in place.
- .
- Did the 3d animation appear?
+ PURPOSE:
+     This test tests the basic 3D capabilities of your video card
+ STEPS:
+     1. Click "Test" to execute an OpenGL demo. Press ESC at any time to close.
+     2. Verify that the animation is not jerky or slow.
+ VERIFICATION:
+     1. Did the 3d animation appear?
+     2. Was the animation free from slowness/jerkiness?
 
=== modified file 'jobs/hibernate.txt.in'
--- jobs/hibernate.txt.in	2011-09-01 12:23:07 +0000
+++ jobs/hibernate.txt.in	2011-11-18 18:04:27 +0000
@@ -5,10 +5,12 @@
 user: root
 command: sleep_test -s disk -w 120 --debug
 _description:
- This will check to make sure your system can successfully hibernate (if supported).
- .
- Select Test to begin. The system will hibernate and should wake itself within 5 minutes.  If your system does not wake itself after 5 minutes, please press the power button to wake the system manually. If the system fails to resume from hibernate, please restart System Testing and mark this test as Failed.
- .
- Did the system successfully hibernate and did it work properly after waking up?
-
-
+ PURPOSE:
+     This test will check to make sure your system can successfully hibernate (if supported)
+ STEPS:
+     1. Click on Test
+     2. The system will hibernate and should wake itself within 5 minutes
+     3. If your system does not wake itself after 5 minutes, please press the power button to wake the system manually
+     4. If the system fails to resume from hibernate, please restart System Testing and mark this test as Failed
+ VERIFICATION:
+     Did the system successfully hibernate and did it work properly after waking up?
 
=== modified file 'jobs/info.txt.in'
--- jobs/info.txt.in	2011-09-14 21:16:02 +0000
+++ jobs/info.txt.in	2011-11-18 18:04:27 +0000
@@ -1,44 +1,57 @@
-
-name: info/codecs_attachment
+name: codecs_attachment
 plugin: attachment
 requires: device.driver == 'HDA Intel'
 command: cat /proc/asound/card*/codec#*
+_description: Attaches a report of installed codecs for Intel HDA
 
-name: info/cpuinfo_attachment
+name: cpuinfo_attachment
 plugin: attachment
 command: cat /proc/cpuinfo
+_description: Attaches a report of CPU information
 
-name: info/dmesg_attachment
+name: dmesg_attachment
 plugin: attachment
 command: cat /var/log/dmesg | ansi_parser
+_description: Attaches a copy of /var/log/dmesg to the test results
 
-name: info/dmi_attachment
+name: dmi_attachment
 plugin: attachment
 command: grep -r . /sys/class/dmi/id/ 2>/dev/null
+_description: Attaches info on DMI
 
-name: info/dmidecode_attachment
+name: dmidecode_attachment
 plugin: attachment
 user: root
 command: dmidecode
+_description: Attaches dmidecode output
 
-name: info/lspci_attachment
+name: lspci_attachment
 plugin: attachment
 command: lspci -vvnn
-
-name: info/modprobe_attachment
+_description: Attaches very verbose lspci output.
+
+name: meminfo_attachment
+plugin: attachment
+command: cat /proc/meminfo
+
+name: modprobe_attachment
 plugin: attachment
 command: find /etc/modprobe.* -name \*.conf | xargs cat
+_description: Attaches the contents of the various modprobe conf files.
 
-name: info/modules_attachment
+name: modules_attachment
 plugin: attachment
 command: cat /etc/modules
+_description: Attaches the contents of the /etc/modules file.
 
-name: info/sysctl_attachment
+name: sysctl_attachment
 plugin: attachment
 command: find /etc/sysctl.* -name \*.conf | xargs cat
+_description: attaches the contents of various sysctl config files.
 
-name: info/sysfs_attachment
+name: sysfs_attachment
 plugin: attachment
+_description: Attaches a report of sysfs attributes.
 command:
  for i in `udevadm info --export-db | sed -n 's/^P: //p'`; do
   echo "P: $i"
@@ -46,19 +59,22 @@
   echo
  done
 
-name: info/udev_attachment
+name: udev_attachment
 plugin: attachment
 command: udevadm info --export-db
+_description: Attaches a dump of the udev database showing system hardware information.
 
-name: info/gcov_attachment
+name: gcov_attachment
 plugin: attachment
 requires: package.name == 'lcov'
 user: root
 command: gcov_tarball
+_description: Attaches a tarball of gcov data if present.
 
-name: info/lsmod_attachment
+name: lsmod_attachment
 plugin: attachment
 command: lsmod
+_description: Attaches a list of the currently running kernel modules.
 
 plugin: shell
 name: info/screenshot
@@ -66,25 +82,25 @@
  package.name == 'xorg'
  package.name == 'imagemagick'
 command: import -window root ${CHECKBOX_DATA}/screenshot.png
-_description:
- Captures a screenshot.
+_description: Captures a screenshot.
 
 plugin: attachment
-name: info/screenshot.png
+name: screenshot.png
 depends: screenshot
 command: cat ${CHECKBOX_DATA}/screenshot.png
+_description: Attaches the screenshot captured in info/screenshot.
 
 plugin: attachment
-name: info/fwts_log
+name: fwts_log
 depends: fwts_test
-_description:
- Gather log from the firmware test suite run
+_description: Gather log from the Firmware Test Suite run.
 command:
  cat $CHECKBOX_DATA/fwts_results.log
 
 plugin: attachment
-name: info/acpi_sleep_attachment
-command: cat /proc/acpi/sleep
+name: acpi_sleep_attachment
+command: [ -e /proc/acpi/sleep ] && cat /proc/acpi/sleep
+_description: Attaches the contents of /proc/acpi/sleep if it exists.
 
 plugin: local
 name: info/bootchart
@@ -111,25 +127,29 @@
  EOF
 
 plugin: attachment
-name: info/bootchart.png
+name: bootchart.png
 depends: info/bootchart
 requires: (package.name == 'bootchart' and float(lsb.release) < 9.04) or package.name == 'pybootchartgui'
+_description: Attaches the bootchart png file for bootchart runs
 command:
  file=`ls /var/log/bootchart/*.png 2>/dev/null | tail -1`; \
  [ -e "$file" ] && cat "$file"
 
 plugin: attachment
-name: info/bootchart.tgz
+name: bootchart.tgz
 depends: info/bootchart
 requires: package.name == 'bootchart' and float(lsb.release) >= 9.04
+_description: Attaches the bootchart log for bootchart test runs.
 command:
  file=`ls /var/log/bootchart/*.tgz 2>/dev/null | tail -1`; \
  [ -e "$file" ] && cat "$file"
 
 plugin: attachment
-name: info/installer_bootchart.tgz
+name: installer_bootchart.tgz
 command: [ -e /var/log/installer/bootchart.tgz ] && cat /var/log/installer/bootchart.tgz
+_description: installs the installer bootchart tarball if it exists.
 
 plugin: attachment
-name: info/installer_debug.gz
+name: installer_debug.gz
 command: [ -e /var/log/installer/debug ] && gzip -9 -c /var/log/installer/debug
+_description: Attaches the installer debug log if it exists.
 
=== modified file 'jobs/input.txt.in'
--- jobs/input.txt.in	2011-08-10 21:09:56 +0000
+++ jobs/input.txt.in	2011-11-18 18:04:27 +0000
@@ -1,16 +1,24 @@
 plugin: manual
 name: input/mouse
-requires: device.category == 'MOUSE'
+requires: device.category == 'MOUSE' or device.category == 'TOUCH'
 _description:
- Moving the mouse should move the cursor on the screen.
- .
- Is your mouse working properly?
+ PURPOSE:
+     This test will test your pointing device
+ STEPS:
+     1. Move the cursor using the pointing device or touch the screen.
+     2. Perform some single/double/right click operations.
+ VERIFICATION:
+     Did the pointing device work as expected?
 
 plugin: manual
 name: input/keyboard
 command: keyboard_test
 requires: device.category == 'KEYBOARD'
 _description:
- Select Test to open a text area where to type keys on your keyboard.
- .
- Is your keyboard working properly?
+ PURPOSE:
+     This test will test your keyboard
+ STEPS:
+     1. Click on Test
+     2. On the open text area, use your keyboard to type something
+ VERIFICATION:
+     Is your keyboard working properly?
 
=== modified file 'jobs/install.txt.in'
--- jobs/install.txt.in	2011-09-01 12:23:07 +0000
+++ jobs/install.txt.in	2011-11-18 18:04:27 +0000
@@ -4,4 +4,4 @@
 user: root
 command: apt-get -d -y --force-yes dist-upgrade && true || false
 _description: 
- Tests to see that apt can access repositories and get updates (does not install updates)
+ Tests to see that apt can access repositories and get updates (does not install updates). This is done to confirm that you could recover from an incomplete or broken update.
 
=== modified file 'jobs/keys.txt.in'
--- jobs/keys.txt.in	2011-09-01 12:23:07 +0000
+++ jobs/keys.txt.in	2011-11-18 18:04:27 +0000
@@ -1,73 +1,86 @@
 plugin: manual
 name: keys/brightness
-requires: device.product in ['Notebook','Laptop','Portable']
+requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
- Press the brightness buttons on the keyboard. A status window should \
- appear and the brightness should change.
- .
- Do the buttons work?
+ PURPOSE:
+     This test will test the brightness key
+ STEPS:
+     1. Press the brightness buttons on the keyboard
+ VERIFICATION:
+     Did the brightness change following to your key presses?
 
 plugin: manual
 name: keys/volume
 _description:
- Press the volume buttons on the keyboard. A status window should \
- appear and the volume should change.
- .
- Do the buttons work?
+ PURPOSE:
+     This test will test the volume keys
+ STEPS:
+     1. Press the volume buttons on the keyboard
+ VERIFICATION:
+     Did the volume change following to your key presses?
 
 plugin: manual
 name: keys/mute
-requires: device.product in ['Notebook','Laptop','Portable']
+requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
- Press the mute key on the keyboard. A status window should appear \
- and the volume should mute/unmute when pressed multiple times.
- .
- Does the key work?
+ PURPOSE:
+     This test will test the mute key
+ STEPS:
+     1. Press the mute button on the keyboard
+ VERIFICATION:
+     Did the volume mute following your key presses?
 
 plugin: manual
 name: keys/sleep
-requires: device.product in ['Notebook','Laptop','Portable']
+requires: dmi.product in ['Notebook','Laptop','Portable']
 depends: suspend/suspend_advanced
 _description:
- Press the sleep key on the keyboard. The computer should suspend and, \
- after pressing the power button, resume successfully.
- .
- Does the key work?
+ PURPOSE:
+     This test will test the sleep key
+ STEPS:
+     1. Press the sleep key on the keyboard
+     2. Wake your system up by pressing the power button
+ VERIFICATION:
+     Did the system go to sleep after pressing the sleep key?
 
 plugin: manual
 name: keys/battery-info
-requires: device.product in ['Notebook','Laptop','Portable']
+requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
- Press the battery information key on the keyboard. A status window \
- should appear and the amount of battery remaining should be displayed.
- .
- Does the key work?
+ PURPOSE:
+     This test will test the battery information key
+ STEPS:
+     1. Press the battery information key on the keyboard
+ VERIFICATION:
+     Did a notification appear showing the battery status?
 
 plugin: manual
 name: keys/wireless
-requires: device.product in ['Notebook','Laptop','Portable']
+requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
- Press the wireless networking key on the keyboard. The bluetooth icon \
- and the network connnection should go down if connected through the \
- wifi interface.
- .
- Press the same key again and check that bluetooth icon is again \
- displayed and that the network connection is re-established \
- automatically.
- .
- Does the key work?
+ PURPOSE:
+     This test will test the wireless key
+ STEPS:
+     1. Press the wireless key on the keyboard
+     2. Press the same key again
+ VERIFICATION:
+     Did the wireless go off on the first press and on again on the second?
 
 plugin: manual
 name: keys/media-control
-requires: device.category == 'KEYBOARD'
+requires:
+ device.category == 'KEYBOARD'
+ package.name == 'totem'
+ package.name == 'gstreamer0.10-plugins-base'
+command: totem /usr/share/example-content/Ubuntu_Free_Culture_Showcase/*
 _description:
- The keyboard may have dedicated keys for controlling media as follows:
- .
- * Play/Pause
- * Stop
- * Forward
- * Backward (Rewind)
- .
- Play a media file and press each key in turn.
- .
- Do the keys work as expected?
+ PURPOSE:
+     This test will test the media keys of your keyboard
+ STEPS:
+     1. Click test to launch the media player
+     2. Press the play/pause key on the keyboard
+     3. Press the forward key on the keyboard
+     4. Press the backward key on the keyboard
+     5. Press stop key on the keyboard
+ VERIFICATION:
+     Do the keys work as expected?
 
=== modified file 'jobs/local.txt.in'
--- jobs/local.txt.in	2011-09-01 12:23:07 +0000
+++ jobs/local.txt.in	2011-11-18 18:04:27 +0000
@@ -3,6 +3,11 @@
 _description: Audio tests
 command: cat $CHECKBOX_SHARE/jobs/audio.txt*
 
+name: __autotest__
+plugin: local
+_description: Autotest Suite tests
+command: cat $CHECKBOX_SHARE/jobs/autotest.txt*
+
 name: __bluetooth__
 plugin: local
 _description: Bluetooth tests
@@ -13,7 +18,7 @@
 _description: Camera tests
 command: cat $CHECKBOX_SHARE/jobs/camera.txt*
 
-name: codecs
+name: __codecs__
 plugin: local
 _description: Codec tests
 command: cat $CHECKBOX_SHARE/jobs/codecs.txt*
@@ -23,7 +28,7 @@
 _description: CPU tests
 command: cat $CHECKBOX_SHARE/jobs/cpu.txt*
 
-name: daemon
+name: __daemons__
 plugin: local
 _description: System Daemon tests
 command: cat $CHECKBOX_SHARE/jobs/daemons.txt*
@@ -53,6 +58,11 @@
 _description: Graphics tests
 command: cat $CHECKBOX_SHARE/jobs/graphics.txt*
 
+name: __hibernate__
+plugin: local
+_description: Hibernation tests
+command: cat $CHECKBOX_SHARE/jobs/hibernate.txt*
+
 name: __info__
 plugin: local
 _description: Informational tests
@@ -73,10 +83,15 @@
 _description: Hotkey tests
 command: cat $CHECKBOX_SHARE/jobs/keys.txt*
 
-name: __hibernate__
-plugin: local
-_description: Hibernation tests
-command: cat $CHECKBOX_SHARE/jobs/hibernate.txt*
+name: __ltp__
+plugin: local
+_description: Linux Test Project tests
+command: cat $CHECKBOX_SHARE/jobs/ltp.txt*
+
+name: __mago__
+plugin: local
+_description: Mago Automated Desktop Testing
+command: cat $CHECKBOX_SHARE/jobs/mago.txt*
 
 name: __mediacard__
 plugin: local
@@ -108,6 +123,11 @@
 _description: Optical Drive tests
 command: cat $CHECKBOX_SHARE/jobs/optical.txt*
 
+name: __panel_clock__
+plugin: local
+_description: Panel Clock Verification tests
+command: cat $CHECKBOX_SHARE/jobs/panel_clock_test.txt*
+
 name: __pcmcia-pcix__
 plugin: local
 _description: PCMCIA/PCIX Card tests
@@ -118,11 +138,26 @@
 _description: Peripheral tests
 command: cat $CHECKBOX_SHARE/jobs/peripheral.txt*
 
+name: __phoronix__
+plugin: local
+_description: Phoronix Test Suite tests
+command: cat $CHECKBOX_SHARE/jobs/peripheral.txt*
+
 name: __power-management__
 plugin: local
 _description: Power Management tests
 command: cat $CHECKBOX_SHARE/jobs/power-management.txt*
 
+name: __qa__
+plugin: local
+_description: QA Regression tests
+command: cat $CHECKBOX_SHARE/jobs/qa_regression.txt*
+
+name: __server-services__
+plugin: local
+_description: Server Services checks
+command: cat $CHECKBOX_SHARE/jobs/server-services.txt*
+
 name: __suspend__
 plugin: local
 _description: Suspend tests
 
=== modified file 'jobs/ltp.txt.in'
--- jobs/ltp.txt.in	2010-03-09 16:58:36 +0000
+++ jobs/ltp.txt.in	2011-11-18 18:04:27 +0000
@@ -1,6 +1,7 @@
-name: ltp
+name: ltp/syscalls
 plugin: remote
-_description: Linux Test Project
+_description: 
+ This test installs and runs Linux Test Project syscalls test. This can be destructive, thus this test is blacklisted by default.
 requires:
  package.alias == 'linux'
  package.name == 'cvs'
 
=== modified file 'jobs/mago.txt.in'
--- jobs/mago.txt.in	2011-07-01 11:37:27 +0000
+++ jobs/mago.txt.in	2011-11-18 18:04:27 +0000
@@ -1,8 +1,10 @@
 plugin: remote
-name: mago
-_description: Automated desktop testing
+name: mago/suite
 requires:
  package.name == 'bzr'
  package.name == 'python-ldtp'
  desktop.gnome.interface.accessibility == True
 command: mago_suite
+_description: 
+ PURPOSE:
+    This test installs and runs the Mago Automated Desktop Testing suite.
 
=== modified file 'jobs/mediacard.txt.in'
--- jobs/mediacard.txt.in	2011-09-29 13:12:01 +0000
+++ jobs/mediacard.txt.in	2011-11-18 18:04:27 +0000
@@ -1,137 +1,159 @@
 plugin: manual
 name: mediacard/sd
 _description:
- Secure Digital (SD) media card support verification:
-  1.- Plug a SD media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Secure Digital (SD) media card support
+ STEPS:
+     1. Plug a SD media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/sd_after_suspend
 depends: suspend/suspend_advanced mediacard/sd
 _description:
- Secure Digital (SD) media card support re-verification:
-  1.- Plug a SD media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Secure Digital (SD) media card support after suspend
+ STEPS:
+     1. Plug a SD media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/sdhc
 _description:
- Secure Digital High Capacity (SDHC) media card support verification:
-  1.- Plug a SDHC media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Secure Digital High Capacity (SDHC) media card support
+ STEPS:
+     1. Plug a SDHC media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/sdhc_after_suspend
 depends: suspend/suspend_advanced mediacard/sdhc
 _description:
- Secure Digital High Capacity (SDHC) media card support re-verification:
-  1.- Plug a SDHC media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+     This test will check your system Secure Digital High Capacity (SDHC) media card support after suspend
+ STEPS:
+     1. Plug a SDHC media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/mmc
 _description:
- Multi Media Card (MMC) media card support verification:
-  1.- Plug a MMC media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Multi Media Card (MMC) media card support
+ STEPS:
+     1. Plug a MMC media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/mmc_after_suspend
 depends: suspend/suspend_advanced mediacard/mmc
 _description:
- Multi Media Card (MMC) media card support re-verification:
-  1.- Plug a MMC media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Multi Media Card (MMC) media card support after suspend
+ STEPS:
+     1. Plug a MMC media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/ms
 _description:
- Memory Stick (MS) media card support verification:
-  1.- Plug a MS media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Memory Stick (MS) media card support
+ STEPS:
+     1. Plug a MS media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/ms_after_suspend
 depends: suspend/suspend_advanced mediacard/ms
 _description:
- Memory Stick (MS) media card support re-verification:
-  1.- Plug a MS media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Memory Stick (MS) media card support after suspend
+ STEPS:
+     1. Plug a MS media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/msp
 _description:
- Memory Stick Pro (MSP) media card support verification:
-  1.- Plug a MSP media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Memory Stick Pro (MSP) media card support
+ STEPS:
+     1. Plug a MSP media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/msp_after_suspend
 depends: suspend/suspend_advanced mediacard/msp
 _description:
- Memory Stick Pro (MSP) media card support re-verification:
-  1.- Plug a MSP media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Memory Stick Pro (MSP) media card support after suspend
+ STEPS:
+     1. Plug a MSP media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/cf
 _description:
- Compact Flash (CF) media card support verification:
-  1.- Plug a CF media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+ PURPOSE:
+     This test will check your system Compact Flash (CF) media card support
+ STEPS:
+     1. Plug a CF media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
 plugin: manual
 name: mediacard/cf_after_suspend
 depends: suspend/suspend_advanced mediacard/cf
 _description:
- Compact Flash (CF) media card support re-verification:
-  1.- Plug a CF media card into the computer.
-  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
-  3.- Right click on the deskop icon and select "Safely Remove Drive".
-  4.- The icon should disappear of both the deskop and the "Places" menu.
- .
- Does the icon automatically appear/disappear?
+     This test will check your system Compact Flash (CF) media card support after suspend
+ STEPS:
+     1. Plug a CF media card into the computer
+     2. An icon should appear on the Launcher
+     3. Right click on the Launcher icon and select "Safely Remove Drive"
+     4. The icon should disappear from the Launcher
+ VERIFICATION:
+     Does the icon automatically appear/disappear?
 
=== modified file 'jobs/memory.txt.in'
--- jobs/memory.txt.in	2011-09-14 21:16:02 +0000
+++ jobs/memory.txt.in	2011-11-18 18:04:27 +0000
@@ -2,11 +2,14 @@
 name: memory/info
 command: memory_info
 _description:
- The following amount of memory was detected:
- .
- $output
- .
- Is this correct?
+ PURPOSE:
+     This test checks the amount of memory that is detected
+ STEPS:
+     1. Click Test to see the amount of detected memory
+ INFO:
+     $output
+ VERIFICATION:
+     Is the amount of detected memory correct?
 
 plugin: shell
 name: memory/check
 
=== modified file 'jobs/miscellanea.txt.in'
--- jobs/miscellanea.txt.in	2011-09-29 13:12:01 +0000
+++ jobs/miscellanea.txt.in	2011-11-18 18:04:27 +0000
@@ -6,11 +6,12 @@
 user: root
 command: cycle_vts
 _description:
- Select Test to switch to another virtual terminal and then back to X.  Your screen will change temporarily to a text console and then switch back to your current session.
- .
- Note that this test may require you to enter your password.
- .
- Did the screen change temporarily to a text console?
+ PURPOSE:
+     This test will check that the system can switch to a virtual terminal and back to X
+ STEPS:
+     1. Click "Test" to switch to another virtual terminal and then back to X
+ VERIFICATION:
+     Did your screen change temporarily to a text console and then switch back to your current session?
 
 plugin: shell
 name: miscellanea/fwts_test
@@ -18,7 +19,7 @@
   package.name == 'linux'
   package.name == 'fwts'
 _description:
- Run Colin King's Firmware Test Suite automated tests.
+ Run Firmware Test Suite (fwts) automated tests.
 command:
  fwts_test -l $CHECKBOX_DATA/fwts_results.log
 
@@ -39,6 +40,16 @@
 plugin: manual
 name: miscellanea/is_laptop
 _description:
- Is your system a laptop (or netbook)?
+ PURPOSE:
+    This is to determine if we need to run tests specific to portable computers that may not apply to desktops.
+ STEPS:
+    Select "Yes" if your system is a laptop or netbook. Otherwise, select "No"
+
+plugin: shell
+name: miscellanea/apport-directory
+requires: package.name == 'apport'
+command: ! test -d /var/crash || test $(find /var/crash -type f | wc -l) -eq 0
+_description: 
+ This test checks /var/crash to see if there are any crash reports present.
  .
- Selecting Yes here will allow us to run tests specific to portable computers that may not apply to desktops.
+ If there are, this test will fail.
 
=== modified file 'jobs/monitor.txt.in'
--- jobs/monitor.txt.in	2011-09-14 21:16:02 +0000
+++ jobs/monitor.txt.in	2011-11-18 18:04:27 +0000
@@ -1,52 +1,71 @@
 plugin: manual
 name: monitor/vga
 _description:
- If your system does not have a VGA port, please skip this test.
- .
- Connect a display (if not already connected) to the VGA port on your system. Is the image displayed correctly?
+ PURPOSE:
+     This test will check your VGA port. Skip if your system does not have a VGA port.
+ STEPS:
+     1. Connect a display (if not already connected) to the VGA port on your system
+ VERIFICATION:
+     Was the desktop displayed correctly on both screens?
 
 plugin: manual
 name: monitor/dvi
 _description:
- If your system does not have a DVI port, please skip this test.
- .
- Connect a display (if not already connected) to the DVI port on your system. Is the image displayed correctly?
+ PURPOSE:
+     This test will check your DVI port. Skip if your system does not have a DVI port
+ STEPS:
+     1. Connect a display (if not already connected) to the DVI port on your system
+ VERIFICATION:
+     Was the desktop displayed correctly on both screens?
 
 plugin: manual
 name: monitor/displayport
 _description:
- If your system does not have DisplayPort, please skip this test.
- .
- Connect a display (if not already connected) to the DisplayPort on your system. Is the image displayed correctly?
+ PURPOSE:
+     This test will check your DisplayPort port. Skip if your system does not have a DisplayPort port
+ STEPS:
+     1. Connect a display (if not already connected) to the DisplayPort port on your system
+ VERIFICATION:
+     Was the desktop displayed correctly on both screens?
 
 plugin: manual
 name: monitor/hdmi
 _description:
- If your system does not have a HDMI port, please skip this test.
- .
- Connect a display (if not already connected) to the HDMI port on your system. Is the image displayed correctly?
+ PURPOSE:
+     This test will check your HDMI port. Skip if your system does not have a HDMI port
+ STEPS:
+     1. Connect a display (if not already connected) to the HDMI port on your system
+ VERIFICATION:
+     Was the desktop displayed correctly on both screens?
 
 plugin: manual
 name: monitor/svideo
 _description: