Merge lp:~brendan-donegan/ubuntu/raring/checkbox/0.15.4 into lp:ubuntu/raring/checkbox

[Brendan Donegan]

checkbox (0.15.4) raring; urgency=low

  * New upstream release (LP: #1152223)

  [ Daniel Manrique ]
  * Added pipefail option to a few jobs using ansi_parser (LP: #1131598)

  [ Jeff Marcom ]
  * jobs/input.txt.in Added job requirement for accelerometer test (LP: #1135832)

  [Sylvain Pineau]
  * scripts/network_device_info, scripts/udev_resource,
    checkbox/parsers/udevadm.py: Use udev to categorise network devices instead
    of lspci (LP: #1091633)

 -- Brendan Donegan <email address hidden> Thu, 07 Mar 2013 15:43:13 +0000

[Daniel Manrique (roadmr)]

Thanks, merged.

review: Approve

=== modified file 'Vagrantfile'
--- Vagrantfile	2013-02-22 16:26:25 +0000
+++ Vagrantfile	2013-03-07 16:10:38 +0000
@@ -5,24 +5,29 @@
 
   # Define a Ubuntu Server image (cloud) for the 12.10 release (quantal)
   config.vm.define :quantal do |quantal_config|
-    quantal_config.vm.box = "quantal-cloud-amd64"
-    quantal_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-amd64-vagrant-disk1.box"
+    quantal_config.vm.box = "quantal-cloud-i386"
+    quantal_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-i386-vagrant-disk1.box"
   end
 
   # Define a Ubuntu Server image (cloud) for the 12.04 release (precise)
   config.vm.define :precise do |precise_config|
-    precise_config.vm.box = "precise-cloud-amd64"
-    precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+    precise_config.vm.box = "precise-cloud-i386"
+    precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
   end
 
   # For debugging and later future GUI testing
   # config.vm.boot_mode = :gui
 
-  # Update to have the latest packages
-  # Commented out for now, we don't really need it
-  # config.vm.provision :shell, :inline => "apt-get update && apt-get dist-upgrade"
+  # Update to have the latest packages, this is needed because the image comes
+  # with an old (and no longer working) apt cache and links to many packages no
+  # longer work.
+  config.vm.provision :shell, :inline => "apt-get update && apt-get dist-upgrade --yes"
   # Install dependencies from native packages
-  config.vm.provision :shell, :inline => "apt-get install --yes python3-setuptools python3-yaml python3-lxml"
+  config.vm.provision :shell, :inline => "apt-get install --yes python3-setuptools python3-lxml"
+  # Install python3-mock so that we can create mock objects for testing
+  config.vm.provision :shell, :inline => "apt-get install --yes python3-mock"
+  # Install policykit-1 so that we have pkexec
+  config.vm.provision :shell, :inline => "apt-get install --yes policykit-1"
   # Install some checkbox script dependencies:
   # Later on those could be installed on demand to test how we behave without
   # them but for now that's good enough. Little by little...
@@ -38,5 +43,5 @@
   # Develop plainbox so that we have it in $PATH
   config.vm.provision :shell, :inline => "cd /vagrant/plainbox/ && python3 setup.py develop"
   # Create a cool symlink so that everyone knows where to go to
-  config.vm.provision :shell, :inline => "ln -s /vagrant /home/vagrant/checkbox"
+  config.vm.provision :shell, :inline => "ln -fs /vagrant /home/vagrant/checkbox"
 end

=== modified file 'checkbox/parsers/tests/test_submission.py'
--- checkbox/parsers/tests/test_submission.py	2012-10-12 21:39:01 +0000
+++ checkbox/parsers/tests/test_submission.py	2013-03-07 16:10:38 +0000
@@ -153,13 +153,13 @@
         """Device states can be in the udev element."""
         result = self.getResult("submission_udev.xml")
         self.assertTrue("device_states" in result)
-        self.assertEquals(len(result["device_states"]), 77)
+        self.assertEquals(len(result["device_states"]), 82)
 
     def test_device_udevadm(self):
         """Device states can be in a udevadm info element."""
         result = self.getResult("submission_info_udevadm.xml")
         self.assertTrue("device_states" in result)
-        self.assertEquals(len(result["device_states"]), 77)
+        self.assertEquals(len(result["device_states"]), 82)
 
     def test_device_dmidecode(self):
         """Device states can be in a dmidecode info element."""

=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2012-11-12 09:59:00 +0000
+++ checkbox/parsers/udevadm.py	2013-03-07 16:10:38 +0000
@@ -92,8 +92,15 @@
     @property
     def category(self):
         if "IFINDEX" in self._environment:
+            if "DEVTYPE" in self._environment:
+                devtype = self._environment["DEVTYPE"]
+                if devtype == "wlan":
+                    return "WIRELESS"
             return "NETWORK"
 
+        if self.bus == "sound":
+            return "AUDIO"
+
         if self.bus == "ieee80211":
             return "WIRELESS"
 
@@ -383,6 +390,9 @@
         if self.driver == "floppy":
             return "Platform Device"
 
+        if "ID_MODEL_FROM_DATABASE" in self._environment:
+            return self._environment["ID_MODEL_FROM_DATABASE"]
+
         return None
 
     @property
@@ -407,6 +417,17 @@
              and "ID_VENDOR_ENC" in self._environment:
             return decode_id(self._environment["ID_VENDOR_ENC"])
 
+        if "ID_VENDOR_FROM_DATABASE" in self._environment:
+            return self._environment["ID_VENDOR_FROM_DATABASE"]
+
+        return None
+
+    @property
+    def interface(self):
+        if self.category in ("NETWORK", "WIRELESS") \
+            and "INTERFACE" in self._environment:
+            return self._environment["INTERFACE"]
+
         return None
 
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-22 16:41:55 +0000
+++ debian/changelog	2013-03-07 16:10:38 +0000
@@ -1,7 +1,25 @@
+checkbox (0.15.4) raring; urgency=low
+
+  * New upstream release (LP: #1152223)
+
+  [ Daniel Manrique ]
+  * Added pipefail option to a few jobs using ansi_parser (LP: #1131598)
+
+  [ Jeff Marcom ]
+  * jobs/input.txt.in Added job requirement for accelerometer test (LP: #1135832)
+
+  [Sylvain Pineau]
+  * scripts/network_device_info, scripts/udev_resource,
+    checkbox/parsers/udevadm.py: Use udev to categorise network devices instead
+    of lspci (LP: #1091633)
+
+ -- Brendan Donegan <[e-mail]>  Thu, 07 Mar 2013 15:43:13 +0000
+
 checkbox (0.15.3) raring; urgency=low
 
   * New upstream release (LP: #1131801)
 
+  [ Daniel Manrique ]
   * scripts/pts_run: modified to output the full log from phoronix-test-suite
     (LP: #1102819)
 

=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2013-02-22 16:26:25 +0000
+++ debian/po/ast.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2013-02-22 16:26:25 +0000
+++ debian/po/cs.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2013-02-22 16:26:25 +0000
+++ debian/po/de.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2013-02-22 16:26:25 +0000
+++ debian/po/en_AU.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2013-02-22 16:26:25 +0000
+++ debian/po/en_GB.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2013-02-22 16:26:25 +0000
+++ debian/po/es.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2013-02-22 16:26:25 +0000
+++ debian/po/fr.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2013-02-22 16:26:25 +0000
+++ debian/po/gl.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/he.po'
--- debian/po/he.po	2013-02-22 16:26:25 +0000
+++ debian/po/he.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2013-02-22 16:26:25 +0000
+++ debian/po/hu.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/id.po'
--- debian/po/id.po	2013-02-22 16:26:25 +0000
+++ debian/po/id.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2013-02-22 16:26:25 +0000
+++ debian/po/it.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2013-02-22 16:26:25 +0000
+++ debian/po/ja.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2013-02-22 16:26:25 +0000
+++ debian/po/nl.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/oc.po'
--- debian/po/oc.po	2013-02-22 16:26:25 +0000
+++ debian/po/oc.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2013-02-22 16:26:25 +0000
+++ debian/po/pl.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2013-02-22 16:26:25 +0000
+++ debian/po/pt_BR.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2013-02-22 16:26:25 +0000
+++ debian/po/ro.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2013-02-22 16:26:25 +0000
+++ debian/po/ru.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/tr.po'
--- debian/po/tr.po	2013-02-22 16:26:25 +0000
+++ debian/po/tr.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/uk.po'
--- debian/po/uk.po	2013-02-22 16:26:25 +0000
+++ debian/po/uk.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2013-02-22 16:26:25 +0000
+++ debian/po/zh_CN.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2013-02-22 16:26:25 +0000
+++ debian/po/zh_TW.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Type: string
 #. Description

=== modified file 'jobs/graphics.txt.in'
--- jobs/graphics.txt.in	2012-12-12 12:59:22 +0000
+++ jobs/graphics.txt.in	2013-03-07 16:10:38 +0000
@@ -170,7 +170,7 @@
 plugin: shell
 name: graphics/screenshot
 requires: package.name == 'fswebcam'
-command: camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
 _description:
  PURPOSE:
      Take a screengrab of the current screen (logged on Unity desktop)
@@ -191,6 +191,7 @@
 command:
  dbus-launch gsettings set org.gnome.totem repeat true
  totem --fullscreen ${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv 2>/dev/null &
+ set -o pipefail
  sleep 15 && camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
  sleep 5 && totem --quit 2>/dev/null
  dbus-launch gsettings set org.gnome.totem repeat false

=== modified file 'jobs/input.txt.in'
--- jobs/input.txt.in	2013-02-22 16:26:25 +0000
+++ jobs/input.txt.in	2013-03-07 16:10:38 +0000
@@ -44,6 +44,7 @@
 plugin: user-interact
 name: input/accelerometer
 user: root
+requires: module.name in ['hdaps', 'hp_accel'] 
 command: accelerometer_test -m
 _description:
  PURPOSE:

=== modified file 'jobs/optical.txt.in'
--- jobs/optical.txt.in	2012-10-11 20:48:55 +0000
+++ jobs/optical.txt.in	2013-03-07 16:10:38 +0000
@@ -58,7 +58,7 @@
  name: optical/cdrom-write_`ls /sys$path/block`
  requires: device.path == "$path"
  user: root
- command: optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` | ansi_parser
  description:
   PURPOSE:
       This test will check your system's $product CD writing capabilities. This test requires a blank CD-R or CD+R. If you do not have a blank disk, skip this test.
@@ -80,7 +80,7 @@
  name: optical/cdrom-write-automated_`ls /sys$path/block`
  requires: device.path == "$path"
  user: root
- command: optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` | ansi_parser
  description:
   This is an automated version of optical/cdrom-write. It assumes you have already inserted a data CD into your optical drive prior to running Checkbox.
  EOF
@@ -116,7 +116,7 @@
  name: optical/dvd-write_`ls /sys$path/block`
  requires: device.path == "$path"
  user: root
- command: optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` | ansi_parser
  description:
   PURPOSE:
       This test will check your system's $product writing capabilities. This test requires a blank DVD-R or DVD+R. If you do not have a blank DVD disk, skip this test.
@@ -140,7 +140,7 @@
  name: optical/dvd-write-automated_`ls /sys$path/block`
  requires: device.path == "$path"
  user: root
- command: optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` | ansi_parser
  description:
   This is an automated version of optical/dvd-write. It assumes you have already inserted a data DVD into your optical drive prior to running Checkbox.
  EOF

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2013-01-30 21:43:05 +0000
+++ jobs/suspend.txt.in	2013-03-07 16:10:38 +0000
@@ -790,7 +790,7 @@
 name: suspend/screenshot_after_suspend
 depends: suspend/suspend_advanced_auto
 requires: package.name == 'fswebcam'
-command: camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
 _description:
  PURPOSE:
      Take a screengrab of the current screen after suspend (logged on Unity desktop)

=== added file 'plainbox/docs/changelog.rst'
--- plainbox/docs/changelog.rst	1970-01-01 00:00:00 +0000
+++ plainbox/docs/changelog.rst	2013-03-07 16:10:38 +0000
@@ -0,0 +1,32 @@
+ChangeLog
+=========
+
+.. note::
+    This changelog contains only a summary of changes. For a more accurate
+    accounting of development history please inspect the source history
+    directly.
+
+PlainBox 0.3 (Unreleased)
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* Added support for all job types (manual, user-interact, user-verify, attachment, local)
+* Added support for running as another user
+* Added support for creating session checkpoints and resuming testing across reboots
+* Added support for exporting test results to JSON, plain text and XML
+* Added support for handling binary data (eg, binary attachments)
+* Added support for using sub-commands to the main plainbox executable
+* Added documentation to the project 
+* Numerous internal re-factorings, changes and improvements.
+* Improved unit and integration testing coverage
+
+PlainBox 0.2
+^^^^^^^^^^^^
+
+* Last release made from the standalone github tree.
+* Added support for discovering dependencies and automatic dependency
+  resolution (for both job dependencies and resource dependencies)
+
+PlainBox 0.1
+^^^^^^^^^^^^
+
+* Initial release

=== added directory 'plainbox/docs/dev'
=== added file 'plainbox/docs/dev/architecture.rst'
--- plainbox/docs/dev/architecture.rst	1970-01-01 00:00:00 +0000
+++ plainbox/docs/dev/architecture.rst	2013-03-07 16:10:38 +0000
@@ -0,0 +1,337 @@
+PlainBox Architecture
+=====================
+
+This document explains the architecture of PlainBox internals. It should be
+always up-to-date and accurate to the extent of the scope of this overview.
+
+General design considerations
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+PlainBox is a reimplementation of CheckBox that replaces a reactor / event /
+plugin architecture with a monolithic core and tightly integrated components.
+
+The implementation models a few of the externally-visible concepts such as
+jobs, resources and resource programs but also has some additional design that
+was not present in CheckBox before.
+
+The goal of the rewrite is to provide the right model and APIs for user
+interfaces in order to build the kind of end-user solution that we could not
+build with CheckBox.
+
+This is expressed by additional functionality that is there only to provide the
+higher layers with the right data (failure reason, descriptions, etc.). The
+code is also intended to be highly testable. Test coverage at the time of
+writing this document was exceeding 80%
+
+The core requirement for the current phase of PlainBox development is feature
+parity with CheckBox and gradual shift from one to another in the daily
+responsibilities of the Hardware Certification team. Currently PlainBox
+implements a large chunk of core / essential features from CheckBox. While not
+all features are present the core is considered almost feature complete at this
+stage.
+
+Application Skeleton
+^^^^^^^^^^^^^^^^^^^^
+
+This skeleton represents a typical application based on PlainBox. It enumerates
+the essential parts of the APIs from the point of view of an application
+developer.
+
+1. Instantiate :class:`plainbox.impl.checkbox.CheckBox` then call
+   :meth:`plainbox.impl.checkbox.CheckBox.get_builtin_jobs()` to discover all
+   known jobs. In the future this might be replaced by a step that obtains jobs
+   from a named provider.
+
+3. Instantiate :class:`plainbox.impl.runner.JobRunner` so that we can run jobs
+
+4. Instantiate :class:`plainbox.impl.session.SessionState` so that we can keep
+   track of application state.
+
+   - Potentially restore an earlier, interrupted, testing session by calling
+     :meth:`plainbox.impl.session.SessionState.restore()`
+
+   - Potentially remove an earlier, interrupted, testing session by calling
+     :meth:`plainbox.impl.session.SessionState.discard()`
+
+   - Potentially start a new test session by calling
+     :meth:`plainbox.impl.session.SessionState.open()`
+
+5. Allow the user to select jobs that should be executed and update session
+   state by calling
+   :meth:`plainbox.impl.session.SessionState.update_desired_job_list()`
+
+6. For each job in :attr:`plainbox.impl.SessionState.run_list`:
+
+   1. Check if we want to run the job (if we have a result for it from previous
+      runs) or if we must run it (for jobs that cannot be persisted across
+      suspend)
+
+   2. Check if the job can be started by looking at
+      :meth:`plainbox.impl.session.JobState.can_start()`
+
+      - optionally query for additional data on why a job cannot be started and
+        present that to the user.
+
+      - optionally abort the sequence and go to step 5 or the outer loop.
+
+   3. Call :meth:`plainbox.impl.runner.JobRunner.run_job()` with the current
+      job and store the result.
+
+        - optionally ask the user to perform some manipulation
+
+        - optionally ask the user to qualify the outcome
+
+        - optionally ask the user for additional comments
+
+   4. Call :meth:`plainbox.impl.session.SessionState.update_job_result()` to
+      update readiness of jobs that depend on the outcome or output of current
+      job.
+
+   5. Call :meth:`plainbox.impl.session.SessionState.checkpoint()` to ensure
+      that testing can resume after system crash or shutdown.
+
+7. Instantiate the selected state exporter, for example
+   :class:`plainbox.impl.exporters.json.JSONSessionStateExporter` so that we
+   can use it to save test results.
+
+    - optionally pass configuration options to customize the subset and the
+      presentation of the session state
+
+8. Call
+   :meth:`plainbox.impl.exporters.SessionStateExporterBase.get_session_data_subset()`
+   followed by :meth:`plainbox.impl.exporters.SessionStateExporterBase.dump()`
+   to save results to a file.
+
+9. Call :meth:`plainbox.impl.session.SessionState.close()` to remove any
+   nonvolatile temporary storage that was needed for the session.
+
+Essential classes
+=================
+
+:class:`~plainbox.impl.session.SessionState`
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Class representing all state needed during a single program session.
+
+Usage
+-----
+
+The general idea is that you feed the session with a list of known jobs and
+a subset of jobs that you want to run and in return get an ordered list of
+jobs to run.
+
+It is expected that the user will select / deselect and run jobs. This
+class can react to both actions by recomputing the dependency graph and
+updating the read states accordingly.
+
+As the user runs subsequent jobs the results of those jobs are exposed to
+the session with :meth:`update_job_result()`. This can cause subsequent
+jobs to become available (not inhibited by anything). Note that there is no
+notification of changes at this time.
+
+The session does almost nothing by itself, it learns about everything by
+observing job results coming from the job runner
+(:class:`plainbox.impl.runner.JobRunner`) that applications need to
+instantiate.
+
+Suspend and resume
+------------------
+
+The session can save check-point data after each job is executed. This
+allows the system to survive and continue after a catastrophic failure
+(broken suspend, power failure) or continue across tests that require the
+machine to reboot.
+
+.. todo::
+
+    Create a section on suspend/resume design
+
+Implementation notes
+--------------------
+
+Internally it ties into :class:`plainbox.impl.depmgr.DependencySolver` for
+resolving dependencies. The way the session objects are used allows them to
+return various problems back to the UI level - those are all the error
+classes from :mod:`plainbox.impl.depmgr`:
+
+    - :class:`plainbox.impl.depmgr.DependencyCycleError`
+
+    - :class:`plainbox.impl.depmgr.DependencyDuplicateError`
+
+    - :class:`plainbox.impl.depmgr.DependencyMissingError`
+
+Normally *none* of those errors should ever happen, they are only provided
+so that we don't choke when a problem really happens. Everything is checked
+and verified early before starting a job so typical unit and integration
+testing should capture broken job definitions (for example, with cyclic
+dependencies) being added to the repository.
+
+Implementation issues
+---------------------
+
+There are two issues that are known at this time:
+
+* There is too much checkbox-specific knowledge which really belongs
+  elsewhere. We are working to remove that so that non-checkbox jobs
+  can be introduced later. There is a branch in progress that entirely
+  removes that and moves it to a new concept called SessionController.
+  In that design the session delegates understanding of results to a
+  per-job session controller and exposes some APIs to alter the state
+  that was previously internal (most notably a way to add new jobs and
+  resources).
+
+* The way jobs are currently selected is unfortunate because of local jobs
+  that can add new jobs to the system. This causes considerable complexity
+  at the application level where the application must check if each
+  executed job is a 'local' job and re-compute the desired_job_list. This
+  should be replaced by a matcher function that can be passed to
+  SessionState once so that desired_job_list is re-evaluated internally
+  whenever job_list changes.
+
+
+:class:`~plainbox.impl.job.JobDefinition`
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+:term:`CheckBox` has a concept of a :term:`job`. Jobs are named units of
+testing work that can be executed. Typical jobs range from automated CPU power
+management checks, BIOS tests, semi-automated peripherals testing to all manual
+validation by following a script (intended for humans).
+
+Jobs are distributed in plain text files, formated as a loose RFC822 documents
+where typically a single text file contains a few dozen different jobs that
+belong to one topic, for example, all bluetooth tests.
+
+Tests have a number of properties that will not be discussed in detail here,
+they are all documented in :class:`plainbox.impl.job.JobDefinition`. From the
+architecture point of view the four essential properties of a job are *name*,
+*plugin* and *requires* and *depends*. Those are discussed in detail below.
+
+JobDefinition.name
+------------------
+
+The *name* field must be unique and is referred to by other parts of the system
+(such as whitelists). Typically jobs follow a simple naming pattern
+'category/detail', eg, 'networking/modem_connection'. The name must be _unique_
+and this is enforced by the core.
+
+JobDefinition.plugin
+--------------------
+
+The *plugin* field is an archaism from CheckBox and a misnomer (as PlainBox
+does not have any plugins). In the CheckBox architecture it would instruct the
+core which plugin should process that job. In PlainBox it is a way to encode
+what type of a job is being processed. There is a finite set of types that are
+documented below. 
+
+plugin == "shell"
+#################
+
+This value is used for fully automated jobs. Everything the job needs to do is
+automated (preparation, execution, verification) and fully handled by the
+command that is associated with a job.
+
+plugin == "manual" 
+##################
+
+This value is used for fully manual jobs. It has no special handling in the core
+apart from requiring a human-provided outcome (pass/fail classification) 
+
+plugin == "local"
+#################
+
+This value is used for special job generator jobs. The output of such jobs is
+interpreted as additional jobs and is identical in effect to loading such jobs
+from a job definition file. 
+
+There are two practical uses for such jobs:
+
+* Some local jobs are used to generate a number of jobs for each object.
+  This is needed where the tested machine may have a number of such objects
+  and each requires unique testing. A good example is a computer where all
+  network tests are explicitly "instantiated" for each network card
+  present.
+ 
+  This is a valid use case but is rather unfortunate for architecture of
+  PlainBox and there is a desire to replace it with equally-expressive
+  pattern jobs. The advantage is that unlike local jobs (which cannot be
+  "discovered" without enduring any potential side effects that may be
+  caused by the job script command) pattern jobs would allow the core to
+  determine the names of jobs that can be generated and, for example,
+  automatically determine that a pattern job needs to be executed as a
+  dependency of a phantom (yet undetermined) job with a given name.
+
+  The solution with "pattern" jobs may be executed in future phases of
+  PlainBox development. Currently there is no support for that at all.
+
+  Currently PlainBox cannot determine job dependencies across local jobs.
+  That is, unless a local job is explicitly requested (in the desired job
+  list) PlainBox will not be able to run a job that is generated by a local
+  job at all and will treat it as if that job never existed.
+
+* Some local jobs are used to create a form of informal "category".
+  Typically all such jobs have a leading and trailing double underscore,
+  for example '__audio__'. This is currently being used by CheckBox for
+  building a hierarchical tree of tests that the user may select.
+
+  Since this has the same flaws as described above (for pattern jobs) it
+  will likely be replaced by an explicit category field that can be
+  specified each job.
+
+plugin == "resource"
+####################
+
+This value is used for special "data" or "environment" jobs. Their output is
+parsed as a list of RFC822 records and is kept by the core during a testing session.
+
+They are primarily used to determine if a given job can be started. For
+example, a particular bluetooth test may use the _requires_ field to indicate
+that it depends (via a resource dependency) on a job that enumerates devices
+and that one of those devices must be a bluetooth device.
+
+plugin == "user-interact"
+#########################
+
+For all intents and purposes it is equivalent to "manual". The actual
+difference is that a user is expected to perform some physical manipulation
+before an automated test.
+
+plugin == "user-verify"
+#######################
+
+For all intents and purposes it is equivalent to "manual". The actual
+difference is that a user is expected to perform manual verification after an
+automated test.
+
+JobDefinition.depends
+---------------------
+
+The *depends* field is used to express dependencies between two jobs. If job A
+has depends on job B then A cannot start if B is not both finished and
+successful. PlainBox understands this dependency and can automatically sort and
+execute jobs in proper order. In many places of the code this is referred to as
+a "direct dependency" (in contrast to "resource dependency")
+
+The actual syntax is not strictly specified, PlainBox interprets this field as
+a list of tokens delimited by comma or any whitespace (including newlines).
+
+A job may depend on any number of other jobs. There are a number of failure
+modes associated with this feature, all of which are detected and handled by
+PlainBox. Typically they only arise when during CheckBox job development
+(editing actual job files) and are always a sign of a human error. No released
+version of CheckBox or PlainBox should ever encounter any of those issues.
+
+The actual problems are:
+
+* dependency cycles, where job either directly or indirectly depends on
+  itself
+
+* missing dependencies where some job refers to a job that is not defined
+  anywhere.
+
+* duplicate jobs where two jobs with the same name (but different
+  definition) are being introduced to the system.
+
+In all of those cases the core removes the offending job and tries to work
+regardless of the problem. This is intended more as a development aid rather
+than a reliability feature as no released versions of either project should
+cause this problem.

=== added file 'plainbox/docs/dev/index.rst'
--- plainbox/docs/dev/index.rst	1970-01-01 00:00:00 +0000
+++ plainbox/docs/dev/index.rst	2013-03-07 16:10:38 +0000
@@ -0,0 +1,14 @@
+Developers
+==========
+
+The PlainBox project hopes to be a friendly developer environment. We invested
+in a lot of tools to make your life easier. Despite being a business-centric
+software project we welcome and encourage contributions from both Canonical and
+Community members.
+
+.. toctree::
+   :maxdepth: 3
+
+   intro.rst
+   architecture.rst
+   reference.rst

=== added file 'plainbox/docs/dev/intro.rst'
--- plainbox/docs/dev/intro.rst	1970-01-01 00:00:00 +0000
+++ plainbox/docs/dev/intro.rst	2013-03-07 16:10:38 +0000
@@ -0,0 +1,238 @@
+Getting started with development
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+PlainBox uses python3 for development. The core is really system independent
+but you will need Ubuntu to really make the best of it and experience it as we
+do. We encourage everyone to use the most recent Ubuntu release for
+development. Usually this brings the best, most recent tools without having to
+search for software on the Internet.
+
+PlainBox has almost no dependencies itself, almost, because we depend on the
+mighty :term:`CheckBox` project to provide us with a lot of existing
+infrastructure. Testing PlainBox requires additional packages and some
+non-packaged software. You will typically want to install it and take advantage
+of the integration we provide.
+
+.. note::
+
+    If you are working with the source please be aware that PlainBox requires
+    an installed copy of CheckBox. CheckBox in turns is has many scripts that
+    depend on various system packages, including python packages that cannot be
+    installed from pypi. If you were planning on using :command:`virtualenv`
+    then please make sure to create it with the ``--system-site-packages``
+    option.
+
+Get the tools
+-------------
+
+First, you need to install the basic development tools:
+
+.. code-block:: bash
+
+    $ sudo apt-get install bzr python3-setuptools python3-dev python3-doc python3-sphinx python-virtualenv
+
+While developing PlainBox you will often need to run potentially dangerous
+commands on your system, such as asking it to suspend and wake up
+automatically. We also need to support a range of Ubuntu releases, going all
+the way back to Ubuntu 12.04. This may cause compatibility issues that are
+unnoticed all until they hit our CI system. To minimize this PlainBox uses
+:term:`Vagrant` to create lightweight execution environments that transparently
+share your source tree and allow you to quickly create and share testing
+environment that can be deployed by any developer in minutes. Vagrant uses
+:term:`VirtualBox` and while both are packaged in Ubuntu, unless you are
+running Ubuntu 13.04 you should download and install the software from their
+upstream projects. 
+
+If you are running Ubuntu 13.04
+
+.. code-block:: bash
+
+    $ sudo apt-get install vagrant
+
+If you are running earlier version of Ubuntu follow those two links to get started:
+
+ * http://downloads.vagrantup.com/
+ * https://www.virtualbox.org/wiki/Downloads
+
+If you have not installed VirtualBox before, you must add yourself to the
+``vboxusers`` group, log out and log back in again.
+
+.. code-block:: bash
+
+    $ sudo usermod -G vboxusers -a $USER 
+
+Get the source
+--------------
+
+Now that you have all the tools, you can get the source:
+
+.. code-block:: bash
+
+    $ bzr branch lp:checkbox
+
+.. note::
+    If you would rather use ``git`` you can also do that (and in fact, some of
+    us already do). Head to `git-lp homepage <http://zyga.github.com/git-lp/>`_
+    and follow the guide there to use git-lp with this project.
+
+Initialize virtualenv
+---------------------
+
+PlainBox will use a few unpackaged and bleeding-edge releases from :term:`pypi`
+those are installed by additional script. By default the script assumes you
+have a /ramdisk directory but you can pass any path as an argument for an
+alternate location.
+
+.. code-block:: bash
+
+    $ ./mk-venv.sh
+
+After everything is set up you can activate the virtualenv environment with the
+dot command. Note that there *is* a space between the dot and the forward
+slash. You can repeat this command in as many shells as you like.
+
+.. code-block:: bash
+
+    $ . /ramdisk/venv/bin/activate
+
+Once virtualenv is activated your shell prompt will be changed to reflect that.
+You should now be able to run :command:`plainbox --help` to ensure everything
+is working properly.
+
+Initialize vagrant
+------------------
+
+Vagrant allows us to ship a tiny text file :file:`Vagrantfile` that describes
+the development and testing environment. This file tells :command:`vagrant` how
+to prepare a virtual machine for testing. If you never used it before you may
+want to keep a tab open on `vagrant getting started guide
+<http:`http://docs.vagrantup.com/v1/docs/getting-started/index.html>`_
+
+We did all the hard work so that you don't have to, to get everything ready
+just run one command:
+
+.. code-block:: bash
+
+    $ vagrant up
+
+This will download vanilla Ubuntu cloud images, initialize VirtualBox,
+provision virtual machines (one for each supported Ubuntu release) and allow
+you to ssh into them for testing with one command.
+
+This will take a moment, depending on the speed of your network. Once that is
+done you should be able to log into, say, ``precise`` and run
+:command:`plainbox --help` to see if everything is all right.
+
+.. code-block:: bash
+
+    $ vagrant ssh precise
+    vagrant@vagrant-ubuntu-precise-32:~$ plainbox --help
+    usage: plainbox [-h] [-v] {run,special,self-test} ...
+
+    positional arguments:
+      {run,special,self-test}
+        run                 run a test job
+        special             special/internal commands
+        self-test           run integration tests
+
+    optional arguments:
+      -h, --help            show this help message and exit
+      -v, --version         show program's version number and exit
+    $ exit
+
+Running PlainBox tests
+^^^^^^^^^^^^^^^^^^^^^^
+
+PlainBox is designed to be testable so it would be silly if it was hard to run
+tests. Actually, there are many different ways to run tests. They all run the
+same code so don't worry.
+
+To test the current code you are working on you can:
+
+- Run the :command:`./test-in-vagrant.sh` from the plainbox directory. This
+  will take the longes but will go over *all* the tests on *all* the supported
+  versions of Ubuntu. It will run CheckBox unit-tests, PlainBox unit-tests and
+  it will even run integration tests that actually execute jobs. 
+
+- Run :command:`plainbox self-test --unit-tests` or 
+  :command:`plainbox self-test --integration-tests`. This will execute all the
+  tests right on your machine, without any virtualization (well, unless you do
+  that after running :command:`vagrant ssh`). Typically you would run unit
+  tests while being in a ``virtualenv`` with the ``plainbox`` package in
+  development mode, as created by running :command:`python setup.py develop`
+
+- Run :command:`./setup.py test` this will install any required test
+  dependencies from pypi and run unit tests.
+
+- Run the script :command:`test-with-coverage.sh` while being in a virtualenv.
+  This will also compute testing code coverage and is very much recommended
+  while working on new code and tests.
+
+Submitting Patches
+^^^^^^^^^^^^^^^^^^
+
+We use `Launchpad <https://launchpad.net>`_ for most of our project management.
+All code changes should be submitted as merge requests. Launchpad has
+`extensive documentation <https://help.launchpad.net/>`_ on how to use various
+facilities it provides.
+
+In general we are open to contributions but we reserve the right to reject
+patches if they don't fit into the needs of the :term:`Hardware Certification`.
+If you have an idea go and talk to us on :abbr:`IRC (Internet Relay Chat)` on
+the `#ubuntu-quality <irc://freenode.net:8001/#ubuntu-quality>`_ channel. 
+
+We have some basic rules patch acceptance:
+
+0. Be prepare to alter your changes.
+
+   This is a meta-rule. One of the points of code reviews is to improve the
+   proposal. That implies the proposal may need to change. You must be prepared
+   and able to change your code after getting feedback.
+
+   To do that efficiently you must structure your work in a way where each
+   committed change works for you rather than against you. The rules listed
+   below are a reflection of this.
+
+1. Each patch should be a single logical change that can be applied.
+  
+   Don't clump lots of changes into one big patch. That will only delay review,
+   make accepting feedback difficult and annoying. This may mean that the history
+   has many small patches that can land in trunk in a FIFO mode. The oldest patch
+   of your branch may be allowed to land and should make sense. This has
+   implications on how general code editing should be performed. If you break some
+   APIs then firsts introduce a working replacement, then change usage of the API
+   and lastly remove any dead code.
+  
+2. Don't keep junk patches in your branch.
+   
+   Don't keep patches such as "fix typo" in your branch, that makes the review
+   process more difficult as some reviewers will read your patches one by one.
+   This is especially important if your changes are substantial.
+
+3. Don't merge with trunk, rebase on trunk.
+
+   This way you can keep your local delta as a collection of meaningful,
+   readable patches. Reading the full diff and following the complex merge
+   history (especially for long-lived branches) is difficult in practice.
+
+4. Keep unrelated changes in separate branches.
+
+   If you ware working on something and found a bug that needed immediate
+   fixing, typo or anything else that is small and quick to fix, do it. Then
+   take that patch out of your development branch and into a dedicated branch
+   and propose it. As the small change is reviewed and lands you can remove
+   that patch from your development branch.
+  
+   This is intended to help both the developer and the reviewer. Seemingly
+   trivial patches may turn out to be more complicated than initially assumed
+   (and may have their own feedback cycle and iterations). The reviewer can
+   focus on logical changes and not on a collection of unrelated alterations.
+   Lastly we may need to apply some fixes to other supported branches and
+   release those.
+
+5. Don't propose untested code.
+   
+   We generally like tests for new code. This is not a super-strict requirement
+   but unless writing tests is incredibly hard we'd rather wait. If testing is
+   hard we'd rather invest some time in refactoring the code or building
+   required support infrastructure.

=== added file 'plainbox/docs/dev/reference.rst'
--- plainbox/docs/dev/reference.rst	1970-01-01 00:00:00 +0000
+++ plainbox/docs/dev/reference.rst	2013-03-07 16:10:38 +0000
@@ -0,0 +1,154 @@
+.. _code_reference:
+
+.. toctree::
+   :maxdepth: 2
+
+Code reference
+==============
+
+.. note::
+
+    Unless stated otherwise all API is unstable. PlainBox does not offer
+    general API stability at this time.
+
+.. automodule:: plainbox
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.public
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.abc
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.testing_utils
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.testing_utils.cwd
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.testing_utils.io
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.testing_utils.testcases
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.vendor
+    :members:
+
+.. automodule:: plainbox.vendor.extcmd
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.commands
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.commands.selftest
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.exporter
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.exporter.json
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.exporter.rfc822
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.exporter.text
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.box
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.checkbox
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.depmgr
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.integration_tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.job
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.mock_job
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.resource
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.result
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.rfc822
+    :members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.runner
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.session
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: plainbox.impl.testing_utils
+    :members:
+    :undoc-members:
+    :show-inheritance:

=== added file 'plainbox/docs/glossary.rst'
--- plainbox/docs/glossary.rst	1970-01-01 00:00:00 +0000
+++ plainbox/docs/glossary.rst	2013-03-07 16:10:38 +0000
@@ -0,0 +1,104 @@
+Glossary
+========
+
+.. glossary::
+
+    hardware certification
+
+        A process of ensuring that a specific device works well with Ubuntu.
+        For more details see our certification program:
+        
+        http://www.canonical.com/engineering-services/certification/hardware-certification 
+    
+    hardware certification team
+
+        A team inside Canonical working on :term:`Hardware Certification`.
+
+    CheckBox
+        
+        CheckBox is a hardware testing tool developed by Canonical for
+        certifying hardware with Ubuntu. CheckBox is free software and is
+        available at http://launchpad.net/checkbox. The ``checkbox`` package is
+        pre-installed on all Ubuntu systems
+
+    PlainBox
+
+        PlainBox is a rewrite of CheckBox with the aim of improving internal
+        architecture, testability, robustness, quality and speed. It is
+        currently under active development. It is not pre-installed on Ubuntu.
+        It is developed inside CheckBox code repository.
+
+    white list
+
+        White lists are text files used by CheckBox to select Jobs for
+        execution.  They can include simple regular expressions to match and
+        pick many similar jobs at once.
+
+    job
+
+        Jobs are smallest units of testing that can be performed by either
+        CheckBox or PlainBox. All jobs have an unique name. There are many
+        types of jobs, some are fully automated others are fully manual. Some
+        jobs are only an implementation detail and a part of the internal
+        architecture of CheckBox
+
+    resources
+
+        Resources are collections of key-value data sets that are generated by
+        special resource jobs. They are extensively used to indicate hardware
+        or software dependencies. For example a bluetooth test may indicate it
+        requires bluetooth hardware and appropriate software packages
+        installed.
+
+    requirement program
+
+        Requirement programs are small (one to few lines) programs that use a
+        subset of python to execute some code against resources. They are what
+        actually describes the relationship of a Job to some Resources. For
+        example a resource program ``package.name == "bluez"`` indicates that
+        at least one resource generated by the ``package`` job has a key
+        ``name`` equal to the string ``bluez``. 
+
+    attachment
+        
+        Attachments are a special type of a Job that can creates an attachment
+        record in the submission.xml file. They are commonly used to include
+        basic system information files and output of certain commands which can
+        aid in system certification.
+
+    certification website
+
+        The website https://certification.canonical.com/
+
+    Canonical ID
+
+        A number assigned to the specific device (laptop, desktop or server) by
+        Canonical. This number is used on the Certification Website and by the
+        Hardware Certification Team. It is an internal bookkeeping identifier
+        used in our labs.
+
+    Secure ID
+
+        An identifier, similar to Canonical ID, used for hardware
+        certification. This identifier is used when interacting with the
+        Certification Website, it does not reveal anything about the actual
+        hardware (like the manufacturer name or device name)
+
+    pypi
+
+        The Python Package Index where any developer can share their python
+        programs and libraries. Pypi is available at:
+        https://pypi.python.org/pypi. 
+
+    Vagrant
+
+        Vagrant is command line program intended for software developers to
+        quickly create portable virtual environments for testing their software
+        in a production operating system. Vagrant is free software and is
+        available at http://www.vagrantup.com/
+
+    VirtualBox
+
+        VirtualBox is a free, powerful desktop vitalization software.
+        VirtualBox is available in the Ubuntu Software Center and at
+        https://www.virtualbox.org/

=== modified file 'plainbox/docs/index.rst'
--- plainbox/docs/index.rst	2013-02-22 16:26:25 +0000
+++ plainbox/docs/index.rst	2013-03-07 16:10:38 +0000
@@ -3,15 +3,56 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to PlainBox's documentation!
-====================================
-
-Contents:
+PlainBox
+========
+
+:term:`PlainBox` is a hardware testing tool useful for certifying laptops,
+desktops and servers with Ubuntu. It is a replacement for the current
+certification tool, :term:`CheckBox`.
+
+PlainBox *complements* CheckBox. It uses all the hardware test definitions,
+scripts and libraries from CheckBox. PlainBox is currently in **alpha** stages,
+having mostly but not entirely complete core and a developer-centric command
+line interface.
+
+Installation
+^^^^^^^^^^^^
+
+PlainBox can be installed from a :abbr:`PPA (Personal Package Archive)`
+(recommended) or :abbr:`pypi (python package index)` on Ubuntu Precise (12.04)
+or newer.
+
+.. code-block:: bash
+
+    $ sudo add-apt-repository ppa:checkbox-dev/ppa && sudo apt-get update && sudo apt-get install plainbox
+
+
+Testing your hardware
+^^^^^^^^^^^^^^^^^^^^^
+
+To test your hardware with the default set of tests run this command.
+
+.. code-block:: bash
+
+    $ plainbox run --whitelist=default --output-format=xml --output-file=submission.xml
+
+The :file:`submission.xml` you get in the end can be submitted to the
+:term:`certification website`. For more details see :ref:`usage`
+
+.. todo::
+    This example is bad because it is fake. We should improve the core so that
+    a whitelist can referred to by name alone (not by a full path).
+
+Table of contents
+=================
 
 .. toctree::
    :maxdepth: 2
 
-
+   usage.rst
+   dev/index.rst
+   glossary.rst
+   changelog.rst
 
 Indices and tables
 ==================
@@ -19,4 +60,3 @@
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

=== added file 'plainbox/docs/usage.rst'
--- plainbox/docs/usage.rst	1970-01-01 00:00:00 +0000
+++ plainbox/docs/usage.rst	2013-03-07 16:10:38 +0000
@@ -0,0 +1,69 @@
+.. _usage:
+
+Usage
+=====
+
+Currently :term:`PlainBox` has no graphical user interface. To use it you need
+to use the command line.
+
+Basically there is just one command that does everything we can do so far, that
+is :command:`plainbox run`. It has a number of options that tell it which
+:term:`job` to run and what to do with results.
+
+PlainBox has built-in help system so running :command:`plainbox run --help`
+will give you instant information about all the various arguments and options
+that are available. This document is not intended to replace that.
+
+Running a specific job
+^^^^^^^^^^^^^^^^^^^^^^
+
+To run a specific :term:`job` pass it to the ``--include-pattern`` or ``-i``
+option.
+
+For example, to run the ``cpu/scaling_test`` job:
+
+.. code-block:: bash
+
+    $ plainbox run -i cpu/scaling_test
+
+.. note::
+
+    The option ``-i`` can be provided any number of times.
+
+Running jobs related to a specific area
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+PlainBox has no concept of job categories but you can simulate that by
+running all jobs that follow a specific naming pattern. For example, to run
+all of the USB tests you can run the following command:
+
+.. code-block:: bash
+
+    $ plainbox run -i 'usb/'
+
+Running a white list
+^^^^^^^^^^^^^^^^^^^^
+
+To run a :term:`white list` pass the ``--whitelist`` or ``-w`` option.
+
+For example, to run the default white list run:
+
+.. code-block:: bash
+
+    $ plainbox run -w default
+
+Saving test results as XML
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To send test results to the :term:`certification website` you need to pass two
+additional options:
+
+1. ``--output-format=xml``
+2. ``--output-file=NAME`` where *NAME* is a file name
+
+For example, to get the default certification tests ready to be submitted
+run this command:
+
+.. code-block:: bash
+
+    $ plainbox run -w default -f xml -o submission.xml

=== modified file 'plainbox/plainbox/__init__.py'
--- plainbox/plainbox/__init__.py	2012-11-29 00:59:03 +0000
+++ plainbox/plainbox/__init__.py	2013-03-07 16:10:38 +0000
@@ -18,13 +18,13 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox
-========
+:mod:`plainbox` -- main package
+===============================
 
 Simple checkbox redesign, without the complex message passing
 
-All public API is in the 'public' module.
-All abstract base classes are in the 'abc' module.
+All public API is in :mod:`plainbox.public`.
+All abstract base classes are in :mod:`plainbox.abc`.
 """
 
 import sys

=== modified file 'plainbox/plainbox/abc.py'
--- plainbox/plainbox/abc.py	2012-11-29 18:40:46 +0000
+++ plainbox/plainbox/abc.py	2013-03-07 16:10:38 +0000
@@ -18,10 +18,8 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.abc
-============
-
-Abstract base classes used by plainbox
+:mod:`plainbox.abc` -- abstract base classes
+============================================
 
 Those classes are actually implemented in the plainbox.impl package. This
 module is here so that the essential API concepts are in a single spot and are

=== modified file 'plainbox/plainbox/impl/__init__.py'
--- plainbox/plainbox/impl/__init__.py	2012-11-19 10:45:46 +0000
+++ plainbox/plainbox/impl/__init__.py	2013-03-07 16:10:38 +0000
@@ -18,10 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl
-=============
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl` -- implementation package
+==============================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 from functools import wraps

=== modified file 'plainbox/plainbox/impl/box.py'
--- plainbox/plainbox/impl/box.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/box.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.box
-=================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.box` -- command line interface
+==================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 from argparse import ArgumentParser
@@ -34,6 +34,7 @@
 from logging import getLogger
 from os.path import join
 import argparse
+import re
 import sys
 
 from plainbox import __version__ as version
@@ -71,10 +72,16 @@
         group.add_argument(
             '-i', '--include-pattern', action="append",
             metavar='PATTERN', default=[], dest='include_pattern_list',
-            help="Run jobs matching the given pattern")
+            help=("Run jobs matching the given regular expression. Matches "
+                  "from the start to the end of the line."))
+        group.add_argument(
+            '-x', '--exclude-pattern', action="append",
+            metavar="PATTERN", default=[], dest='exclude_pattern_list',
+            help=("Do not run jobs matching the given regular expression. "
+                  "Matches from the start to the end of the line."))
         # TODO: Find a way to handle the encoding of the file
         group.add_argument(
-            '-W', '--whitelist',
+            '-w', '--whitelist',
             metavar="WHITELIST",
             type=FileType("rt"),
             help="Load whitelist containing run patterns")
@@ -88,18 +95,36 @@
     def _get_matching_job_list(self, ns, job_list):
         # Find jobs that matched patterns
         matching_job_list = []
+        # Pre-seed the include pattern list with data read from
+        # the whitelist file.
         if ns.whitelist:
-            ns.include_pattern_list.extend([pattern.strip() for pattern in
-                                        ns.whitelist.readlines()])
+            ns.include_pattern_list.extend([
+                pattern.strip()
+                for pattern in ns.whitelist.readlines()])
+        # Decide which of the known jobs to include
         for job in job_list:
-            for pattern in ns.include_pattern_list:
-                if fnmatch(job.name, pattern):
-                    matching_job_list.append(job)
+            # Reject all jobs that match any of the exclude
+            # patterns, matching strictly from the start to
+            # the end of the line.
+            for pattern in ns.exclude_pattern_list:
+                if re.match(r"^{pattern}$".format(pattern=pattern), job.name):
                     break
+            else:
+                # Then accept (include) all job that matches
+                # any of include patterns, matching strictly
+                # from the start to the end of the line.
+                for pattern in ns.include_pattern_list:
+                    if re.match(r"^{pattern}$".format(pattern=pattern),
+                               job.name):
+                        matching_job_list.append(job)
+                        break
         return matching_job_list
 
 
 class SpecialCommand(PlainBoxCommand, CheckBoxCommandMixIn):
+    """
+    Implementation of ``$ plainbox special``
+    """
 
     def invoked(self, ns):
         job_list = self.get_job_list(ns)
@@ -261,6 +286,17 @@
             raise SystemExit(str(exc))
         return exporter
 
+    def ask_for_resume(self, prompt=None, allowed=None):
+        # FIXME: Add support/callbacks for a GUI
+        if prompt is None:
+            prompt = "Do you want to resume the previous session [Y/n]? "
+        if allowed is None:
+            allowed = ('', 'y', 'Y', 'n', 'N')
+        answer = None
+        while answer not in allowed:
+            answer = input(prompt)
+        return False if answer in ('n', 'N') else True
+
     def _run_jobs(self, ns, job_list, exporter):
         # Compute the run list, this can give us notification about problems in
         # the selected jobs. Currently we just display each problem
@@ -268,8 +304,13 @@
         print("[ Analyzing Jobs ]".center(80, '='))
         # Create a session that handles most of the stuff needed to run jobs
         session = SessionState(job_list)
-        self._update_desired_job_list(session, matching_job_list)
         with session.open():
+            if session.previous_session_file():
+                if self.ask_for_resume():
+                    session.resume()
+                else:
+                    session.clean()
+            self._update_desired_job_list(session, matching_job_list)
             if (sys.stdin.isatty() and sys.stdout.isatty() and not
                     ns.not_interactive):
                 outcome_callback = self.ask_for_outcome

=== modified file 'plainbox/plainbox/impl/checkbox.py'
--- plainbox/plainbox/impl/checkbox.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/checkbox.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.checkbox
-======================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.checkbox` -- CheckBox integration
+=====================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 import io
@@ -102,7 +102,7 @@
         """
         Return the required value of CHECKBOX_SHARE environment variable.
 
-        ..note::
+        .. note::
             This variable is only required by one script.
             It would be nice to remove this later on.
         """
@@ -119,7 +119,7 @@
         This entry is required for CheckBox scripts to import the correct
         CheckBox python libraries.
 
-        ..note::
+        .. note::
             The result may be None
         """
         # NOTE: When CheckBox is installed then all the scripts should not use
@@ -159,7 +159,7 @@
         """
         Return an absolute path of the scripts directory
 
-        ..note::
+        .. note::
             The scripts may not work without setting PYTHONPATH and
             CHECKBOX_SHARE.
         """

=== modified file 'plainbox/plainbox/impl/commands/__init__.py'
--- plainbox/plainbox/impl/commands/__init__.py	2013-01-30 21:43:05 +0000
+++ plainbox/plainbox/impl/commands/__init__.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.commands
-======================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.commands` -- shared code for plainbox sub-commands
+======================================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 from abc import abstractmethod, ABCMeta

=== modified file 'plainbox/plainbox/impl/commands/selftest.py'
--- plainbox/plainbox/impl/commands/selftest.py	2013-02-08 17:02:12 +0000
+++ plainbox/plainbox/impl/commands/selftest.py	2013-03-07 16:10:38 +0000
@@ -19,12 +19,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.commands.selftest
-===============================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.commands.selftest` -- selftest sub-command
+==============================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 from unittest.runner import TextTestRunner
 

=== modified file 'plainbox/plainbox/impl/depmgr.py'
--- plainbox/plainbox/impl/depmgr.py	2012-11-29 18:59:46 +0000
+++ plainbox/plainbox/impl/depmgr.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.depmgr
-====================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.depmgr` -- dependency solver
+================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 from abc import ABCMeta
@@ -148,15 +148,17 @@
     @classmethod
     def resolve_dependencies(cls, job_list, visit_list=None):
         """
-        Solve the dependency graph expressed as a list of job definitions.  The
-        visit_list, if specified, allows to consider only a part of the graph
-        while still having access and knowledge of all jobs.
-
-        Returns the solution (a list of jobs to execute in order)
-
-        raises DependencyCycleError if a cyclic dependency is present.
-
-        raises DependencyMissingErorr if a required job does not exist.
+        Solve the dependency graph expressed as a list of job definitions.
+
+        :param list job_list: list of known jobs
+        :param list visit_list: (optional) list of jobs to solve
+
+        The visit_list, if specified, allows to consider only a part of the
+        graph while still having access and knowledge of all jobs.
+
+        :returns list: the solution (a list of jobs to execute in order)
+        :raises DependencyCycleError: if a cyclic dependency is present.
+        :raises DependencyMissingErorr: if a required job does not exist.
         """
         return cls(job_list)._solve(visit_list)
 

=== modified file 'plainbox/plainbox/impl/exporter/__init__.py'
--- plainbox/plainbox/impl/exporter/__init__.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/exporter/__init__.py	2013-03-07 16:10:38 +0000
@@ -18,10 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.exporter
-======================
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.exporter` -- shared code for session state exporters
+========================================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 from abc import ABCMeta, abstractmethod
@@ -38,11 +40,6 @@
 class classproperty:
     """
     Class property.
-
-    @property
-    @classmethod
-    def foo(cls):
-        ...
     """
     # I wish it was in the standard library or that the composition worked
 
@@ -75,6 +72,7 @@
     OPTION_WITH_DESIRED_JOB_LIST = 'with-job-list'
     OPTION_WITH_RESOURCE_MAP = 'with-resource-map'
     OPTION_WITH_JOB_DEFS = 'with-job-defs'
+    OPTION_WITH_ATTACHMENTS = 'with-attachments'
 
     SUPPORTED_OPTION_LIST = (
         OPTION_WITH_IO_LOG,
@@ -84,6 +82,7 @@
         OPTION_WITH_JOB_LIST,
         OPTION_WITH_RESOURCE_MAP,
         OPTION_WITH_JOB_DEFS,
+        OPTION_WITH_ATTACHMENTS,
     )
 
     def __init__(self, option_list=None):
@@ -133,6 +132,8 @@
                 # TODO: turn session._resource_map to a public property
                 for resource_name, resource_list in session._resource_map.items()
             }
+        if self.OPTION_WITH_ATTACHMENTS in self._option_list:
+            data['attachment_map'] = {}
         for job_name, job_state in session.job_state_map.items():
             if job_state.result.outcome is None:
                 continue
@@ -151,6 +152,16 @@
                         continue
                     data['result_map'][job_name][prop] = \
                     getattr(job_state.result.job, prop)
+
+            # Add Attachements if requested
+            if job_state.result.job.plugin == 'attachment':
+                if self.OPTION_WITH_ATTACHMENTS in self._option_list:
+                    raw_bytes = b''.join((record[2] for record in
+                        job_state.result.io_log if record[1] == 'stdout'))
+                    data['attachment_map'][job_name] = \
+                        base64.standard_b64encode(raw_bytes).decode('ASCII')
+                continue # Don't add attachments IO logs to the result_map
+
             # Add IO log if requested
             if self.OPTION_WITH_IO_LOG in self._option_list:
                 # If requested, squash the IO log so that only textual data is

=== modified file 'plainbox/plainbox/impl/exporter/json.py'
--- plainbox/plainbox/impl/exporter/json.py	2012-12-10 12:38:50 +0000
+++ plainbox/plainbox/impl/exporter/json.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,11 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.exporter.json
-===========================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.exporter.json` -- JSON exporter
+===================================================
+
+.. warning::
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 import json

=== modified file 'plainbox/plainbox/impl/exporter/rfc822.py'
--- plainbox/plainbox/impl/exporter/rfc822.py	2013-01-04 13:31:02 +0000
+++ plainbox/plainbox/impl/exporter/rfc822.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.exporter.rfc822
-===========================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.exporter.rfc822` -- RFC822 exporter
+=======================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 

=== modified file 'plainbox/plainbox/impl/exporter/test_init.py'
--- plainbox/plainbox/impl/exporter/test_init.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/exporter/test_init.py	2013-03-07 16:10:38 +0000
@@ -24,6 +24,7 @@
 Test definitions for plainbox.impl.exporter module
 """
 
+from tempfile import TemporaryDirectory
 from unittest import TestCase
 
 from plainbox.impl.exporter import SessionStateExporterBase
@@ -31,7 +32,7 @@
 from plainbox.impl.session import SessionState
 from plainbox.impl.job import JobDefinition
 from plainbox.impl.result import JobResult, IOLogRecord
-from plainbox.impl.testing_utils import make_job, make_job_result
+from plainbox.impl.testing_utils import make_io_log, make_job, make_job_result
 
 
 class ClassPropertyTests(TestCase):
@@ -95,7 +96,7 @@
         }
         self.assertEqual(data, expected_data)
 
-    def make_realistic_test_session(self):
+    def make_realistic_test_session(self, session_dir):
         # Create a more realistic session with two jobs but with richer set
         # of data in the actual jobs and results.
         job_a = JobDefinition({
@@ -115,17 +116,17 @@
             'job': job_a,
             'outcome': 'pass',
             'return_code': 0,
-            'io_log': (
-                IOLogRecord(0, 'stdout', b'testing\n'),
-            )
+            'io_log': make_io_log(
+                (IOLogRecord(0, 'stdout', b'testing\n'),),
+                session_dir)
         })
         result_b = JobResult({
             'job': job_b,
             'outcome': 'pass',
             'return_code': 0,
-            'io_log': (
-                IOLogRecord(0, 'stdout', b'ready: yes\n'),
-            )
+            'io_log': make_io_log(
+                (IOLogRecord(0, 'stdout', b'ready: yes\n'),),
+                session_dir)
         })
         session.update_job_result(job_a, result_a)
         session.update_job_result(job_b, result_b)
@@ -139,10 +140,11 @@
         #   - OPTION_FLATTEN_IO_LOG
         # The implementation favours SQUASH_IO_LOG
         # and thus the code below tests that option
-        exporter = self.TestSessionStateExporter(
-            self.TestSessionStateExporter.supported_option_list)
-        session = self.make_realistic_test_session()
-        data = exporter.get_session_data_subset(session)
+        with TemporaryDirectory() as scratch_dir:
+            exporter = self.TestSessionStateExporter(
+                self.TestSessionStateExporter.supported_option_list)
+            session = self.make_realistic_test_session(scratch_dir)
+            data = exporter.get_session_data_subset(session)
         expected_data = {
             'job_list': ['job_a', 'job_b'],
             'run_list': ['job_b', 'job_a'],
@@ -166,6 +168,8 @@
                     'command': 'echo ready: yes',
                     'io_log': ['cmVhZHk6IHllcwo='],
                 }
+            },
+            'attachment_map': {
             }
         }
         # This is just to make debugging easier

=== modified file 'plainbox/plainbox/impl/exporter/text.py'
--- plainbox/plainbox/impl/exporter/text.py	2012-12-10 12:38:50 +0000
+++ plainbox/plainbox/impl/exporter/text.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.exporter.text
-===========================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.exporter.text` -- plain text exporter
+=========================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 

=== modified file 'plainbox/plainbox/impl/integration_tests.py'
--- plainbox/plainbox/impl/integration_tests.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/integration_tests.py	2013-03-07 16:10:38 +0000
@@ -18,16 +18,20 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.integration_tests
-===============================
-
-Integration tests for checkbox scripts
+:mod:`plainbox.impl.integration_tests` -- integration tests
+===========================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 from tempfile import TemporaryDirectory
 from unittest import TestCase
 import json
 import os
+import shutil
+import tempfile
 
 from pkg_resources import resource_filename, resource_isdir, resource_listdir
 
@@ -41,6 +45,14 @@
 
     parameter_names = ('job_name',)
 
+    def setUp(self):
+        # session data are kept in XDG_CACHE_HOME/plainbox/.session
+        # To avoid resuming a real session, we have to select a temporary
+        # location instead
+        self._sandbox = tempfile.mkdtemp()
+        self._env = os.environ
+        os.environ['XDG_CACHE_HOME'] = self._sandbox
+
     @classmethod
     def _gen_job_name_values(cls, package='plainbox', root='data/'):
         """
@@ -94,3 +106,7 @@
             expected_result = json.load(stream)
         # Check that results match expected values
         self.assertEqual(actual_result, expected_result)
+
+    def tearDown(self):
+        shutil.rmtree(self._sandbox)
+        os.environ = self._env

=== modified file 'plainbox/plainbox/impl/job.py'
--- plainbox/plainbox/impl/job.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/job.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.job
-=================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.job` -- job definition 
+==========================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 import collections
@@ -41,6 +41,11 @@
 
 
 class JobDefinition(IJobDefinition):
+    """
+    Job definition class.
+
+    Thin wrapper around the RFC822 record that defines a checkbox job definition
+    """
 
     @property
     def plugin(self):
@@ -120,10 +125,15 @@
     def _get_persistance_subset(self):
         state = {}
         state['data'] = {}
-        state['data']['plugin'] = self.plugin
-        state['data']['name'] = self.name
+        for key, value in self._data.items():
+            state['data'][key] = value
         return state
 
+    def __eq__(self, other):
+        if not isinstance(other, JobDefinition):
+            return False
+        return self.get_checksum() == other.get_checksum()
+
     def get_resource_program(self):
         """
         Return a ResourceProgram based on the 'requires' expression.

=== added file 'plainbox/plainbox/impl/mock_job.py'
--- plainbox/plainbox/impl/mock_job.py	1970-01-01 00:00:00 +0000
+++ plainbox/plainbox/impl/mock_job.py	2013-03-07 16:10:38 +0000
@@ -0,0 +1,36 @@
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+:mod:`plainbox.impl.mock_job` -- mock jobs
+==========================================
+"""
+
+from mock import Mock
+
+from plainbox.impl.job import JobDefinition
+
+
+def MockJobDefinition(name,*args, **kwargs):
+    """
+    Mock for JobDefinition class
+    """
+    job = Mock(*args, spec_set=JobDefinition, **kwargs)
+    job.name = name
+    return job

=== modified file 'plainbox/plainbox/impl/resource.py'
--- plainbox/plainbox/impl/resource.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/resource.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.resource
-======================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.resource` -- job resources
+==============================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 import ast
@@ -221,7 +221,7 @@
     """
     A NodeVisitor subclass used to analyze requirement expressions.
 
-    ..warning::
+    .. warning::
 
         Implementation of this class requires understanding of
         some of the lower levels of python. The general idea is

=== modified file 'plainbox/plainbox/impl/result.py'
--- plainbox/plainbox/impl/result.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/result.py	2013-03-07 16:10:38 +0000
@@ -18,16 +18,19 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.result
-====================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.result` -- job result
+=========================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 from collections import namedtuple
+import base64
+import json
 import logging
+import os
 
 from plainbox.abc import IJobResult
 
@@ -48,6 +51,9 @@
 
 
 class JobResult(IJobResult):
+    """
+    Result of running a JobDefinition.
+    """
 
     # The outcome of a job is a one-word classification how how it ran.  There
     # are several values that were not used in the original implementation but
@@ -112,7 +118,11 @@
 
     @property
     def io_log(self):
-        return self._data.get('io_log', ())
+        if os.path.exists(self._data.get('io_log', '')):
+            with open(self._data.get('io_log')) as f:
+                return json.load(f, cls=IoLogDecoder)
+        else:
+            return ()
 
     @property
     def return_code(self):
@@ -121,11 +131,8 @@
     def _get_persistance_subset(self):
         state = {}
         state['data'] = {}
-        state['data']['job'] = self._data['job']
-        state['data']['outcome'] = self._data.get('outcome', None)
-        state['data']['comments'] = self._data.get('comments')
-        state['data']['return_code'] = self._data.get('return_code')
-        # io_log are stored on disk, see session.jobs_io_log_dir
+        for key, value in self._data.items():
+            state['data'][key] = value
         return state
 
     @classmethod
@@ -134,3 +141,26 @@
         Create a JobResult instance from JSON record
         """
         return cls(record['data'])
+
+
+class IoLogEncoder(json.JSONEncoder):
+    """
+    JSON Serialize helper to encode binary io logs
+    """
+
+    def default(self, obj):
+        return base64.standard_b64encode(obj).decode('ASCII')
+
+
+class IoLogDecoder(json.JSONDecoder):
+    """
+    JSON Decoder helper for io logs objects
+    """
+
+    def decode(self, obj):
+        return tuple([IOLogRecord(
+            # io logs namedtuple are recorded as list in json, using _asdict()
+            # would require too much space for little benefit.
+            # IOLogRecord are re created using the list ordering
+            log[0], log[1], base64.standard_b64decode(log[2].encode('ASCII')))
+            for log in super().decode(obj)])

=== modified file 'plainbox/plainbox/impl/rfc822.py'
--- plainbox/plainbox/impl/rfc822.py	2012-12-18 00:26:03 +0000
+++ plainbox/plainbox/impl/rfc822.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,14 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.rfc822
-====================
+:mod:`plainbox.impl.rfc822` -- RFC822 parser
+============================================
 
 Implementation of rfc822 serializer and deserializer.
 
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 import logging
@@ -37,10 +39,11 @@
     """
     Simple class for tracking where something came from
 
-    It has three attributes:
-        filename - the name of the file
-        line_start - the number of the line where the record begins
-        line_end - the number of the line where the record ends
+    :ivar filename: the name of the file
+
+    :ivar line_start: the number of the line where the record begins
+
+    :ivar line_end: the number of the line where the record ends
     """
 
     __slots__ = ['filename', 'line_start', 'line_end']

=== modified file 'plainbox/plainbox/impl/runner.py'
--- plainbox/plainbox/impl/runner.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/runner.py	2013-03-07 16:10:38 +0000
@@ -18,16 +18,17 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.runner
-====================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.runner` -- job runner
+=========================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 import collections
 import datetime
+import json
 import logging
 import os
 import string
@@ -35,7 +36,7 @@
 from plainbox.vendor import extcmd
 
 from plainbox.abc import IJobRunner
-from plainbox.impl.result import JobResult, IOLogRecord
+from plainbox.impl.result import JobResult, IOLogRecord, IoLogEncoder
 
 logger = logging.getLogger("plainbox.runner")
 
@@ -50,6 +51,15 @@
     return ''.join(c if c in valid_chars else '_' for c in _string)
 
 
+def io_log_write(log, stream):
+    """
+    JSON call to serialize io_log objects to disk
+    """
+    json.dump(
+        log, stream, ensure_ascii=False, indent=None, cls=IoLogEncoder,
+        separators=(',', ':'))
+
+
 class CommandIOLogBuilder(extcmd.DelegateBase):
     """
     Delegate for extcmd that builds io_log entries.
@@ -146,15 +156,24 @@
     def __init__(self, prompt):
         self._prompt = prompt
         self._lineno = collections.defaultdict(int)
+        self._abort = False
 
     def on_line(self, stream_name, line):
+        if self._abort:
+            return
         self._lineno[stream_name] += 1
-        print("(job {}, <{}:{:05}>) {}".format(
-            self._prompt, stream_name, self._lineno[stream_name],
-            line.rstrip()))
+        try:
+            print("(job {}, <{}:{:05}>) {}".format(
+                self._prompt, stream_name, self._lineno[stream_name],
+                line.decode('UTF-8').rstrip()))
+        except UnicodeDecodeError:
+            self._abort = True
 
 
 class JobRunner(IJobRunner):
+    """
+    Runner for jobs - executes jobs and produces results
+    """
 
     def __init__(self, session_dir, jobs_io_log_dir,
                  command_io_delegate=None, outcome_callback=None):
@@ -173,6 +192,9 @@
         self._outcome_callback = outcome_callback
 
     def run_job(self, job):
+        """
+        Run the specified job an return the result
+        """
         logger.info("Running %r", job)
         func_name = "_plugin_" + job.plugin.replace('-', '_')
         try:
@@ -189,6 +211,8 @@
     def _plugin_shell(self, job):
         return self._just_run_command(job)
 
+    _plugin_attachment = _plugin_shell
+
     def _plugin_resource(self, job):
         return self._just_run_command(job)
 
@@ -227,7 +251,7 @@
             'io_log': io_log
         })
 
-    def _get_script_env(self, job):
+    def _get_script_env(self, job, only_changes=True):
         """
         Compute the environment the script will be executed in
         """
@@ -237,7 +261,17 @@
         env['LANG'] = 'C.UTF-8'
         # Allow the job to customize anything
         job.modify_execution_environment(env, self._session_dir)
-        return env
+        # If a differential environment is requested return only the subset
+        # that has been altered.
+        #
+        # XXX: This will effectively give the root user our PATH which _may_ be
+        # good bud _might_ be dangerous. This will need some peer review.
+        if only_changes:
+            return {key: value
+                    for key, value in env.items()
+                    if key not in os.environ or os.environ[key] != value}
+        else:
+            return env
 
     def _run_command(self, job):
         """
@@ -278,7 +312,7 @@
         # Send the third copy to the output writer that writes everything to
         # disk.
         delegate = extcmd.Chain([
-            extcmd.Decode(ui_io_delegate),
+            ui_io_delegate,
             io_log_builder,
             output_writer])
         logger.debug("job[%s] extcmd delegate: %r", job.name, delegate)
@@ -291,14 +325,37 @@
         # threads although all callbacks will be fired from a single
         # thread (which is _not_ the main thread)
         logger.debug("job[%s] starting command: %s", job.name, job.command)
-        return_code = logging_popen.call(
-            # XXX: sadly using /bin/sh results in broken output
-            # XXX: maybe run it both ways and raise exceptions on differences?
-            ['bash', '-c', job.command],
-            env=self._get_script_env(job))
+        # XXX: sadly using /bin/sh results in broken output
+        # XXX: maybe run it both ways and raise exceptions on differences?
+        cmd = ['bash', '-c', job.command]
+        if job.user is not None:
+            # When the job requires to run as root then elevate our permissions
+            # via pkexec(1). Since pkexec resets environment we need to somehow
+            # pass the extra things we require. To do that we use the env(1)
+            # command and pass it the list of changed environment variables.
+            #
+            # The whole pkexec and env part gets prepended to the command we
+            # were supposed to run.
+            cmd = ['pkexec', '--user', job.user, 'env'] + [
+                "{key}={value}".format(key=key, value=value)
+                for key, value in self._get_script_env(
+                    job, only_changes=True
+                ).items()
+            ] + cmd
+            logging.debug("job[%s] executing %r", job.name, cmd)
+            return_code = logging_popen.call(cmd)
+        else:
+            logging.debug("job[%s] executing %r", job.name, cmd)
+            return_code = logging_popen.call(
+                cmd, env=self._get_script_env(job))
         logger.debug("job[%s] command return code: %r",
                      job.name, return_code)
         # XXX: Perhaps handle process dying from signals here
         # When the process is killed proc.returncode is not set
         # and another (cannot remember now) attribute is set
-        return return_code, io_log_builder.io_log
+        fjson = os.path.join(self._jobs_io_log_dir, "{}.json".format(slug))
+        with open(fjson, "wt") as stream:
+            io_log_write(io_log_builder.io_log, stream)
+            stream.flush()
+            os.fsync(stream.fileno())
+        return return_code, fjson

=== modified file 'plainbox/plainbox/impl/session.py'
--- plainbox/plainbox/impl/session.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/session.py	2013-03-07 16:10:38 +0000
@@ -18,12 +18,12 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.session
-=====================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.session` -- session state handling
+======================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 import json
 import logging
@@ -165,7 +165,7 @@
     """
     Class representing the state of a job in a session.
 
-    Contains two basic properties of each job (either of which can be None):
+    Contains two basic properties of each job:
 
         * the readiness_inhibitor_list that prevent the job form starting
         * the result (outcome) of the run (IJobResult)
@@ -223,7 +223,7 @@
             return self._result
 
         def fset(self, value):
-            if value.job is not self.job:
+            if value.job.get_checksum() != self.job.get_checksum():
                 raise ValueError("result job does not match")
             self._result = value
 
@@ -278,53 +278,79 @@
     """
     Class representing all state needed during a single program session.
 
+    This is the central glue/entry-point for applications. It connects user
+    intents to the rest of the system / plumbing and keeps all of the state in
+    one place.
+
     The set of utility methods and properties allow applications to easily
     handle the lower levels of dependencies, resources and ready states.
 
-    Once instantiated with a list of known jobs it is ready to react to
-    UI-driven changes. It is expected that the user will select / unselect
-    and run jobs. This class can react to both actions by recomputing the
-    dependency graph and updating the read states accordingly.
-
-    Ready states (one for each job) allow the UI to take simple decisions
-    (either can or cannot run)
+    SessionState has the following instance variables, all of which are
+    currently exposed as properties.
+
+    :ivar list job_list: A list of all known jobs
+
+        Not all the jobs from this list are going to be executed (or selected
+        for execution) by the user.
+
+        It may change at runtime because of local jobs. Note that in upcoming
+        changes this will start out empty and will be changeable dynamically.
+        It can still change due to local jobs but there is no API yes.
+
+    :ivar dict job_state_map: mapping that tracks the state of each job
+
+        Mapping from job name to :class:`JobState`. This basically has the test
+        result and the inhibitor of each job. It also serves as a
+        :attr:`plainbox.impl.job.JobDefinition.name`-> job lookup helper.
+
+        Directly exposed with the intent to fuel part of the UI. This is a way
+        to get at the readiness state, result and readiness inhibitors, if any.
+
+        XXX: this can loose data job_list has jobs with the same name. It would
+        be better to use job id as the keys here. A separate map could be used
+        for the name->job lookup. This will be fixed when session controller
+        branch lands in trunk as then jobs are dynamically added to the system
+        one at a time and proper error conditions can be detected and reported.
+
+    :ivar list desired_job_list: subset of jobs selected for execution
+
+        This is used to compute :attr:`run_list`. It can only be changed by
+        calling :meth:`update_desired_job_list()` which returns meaningful
+        values so this is not a settable property.
+
+    :ivar list run_list: sorted list of jobs to execute
+
+        This is basically a superset of desired_job_list and a subset of
+        job_list that is topologically sorted to allowing all desired jobs to
+        run. This property is updated whenever desired_job_list is changed.
+
+    :ivar dict resource_map: all known resources
+
+        A mapping from resource name to a list of
+        :class:`plainbox.impl.resource.Resource` objects. This encapsulates all
+        "knowledge" about the system plainbox is running on.
+
+        It is needed to compute job readiness (as it stores resource data
+        needed by resource programs). It is also available to exporters.
+
+        This is computed internally from the output of checkbox resource jobs,
+        it can only be changed by calling :meth:`update_job_result()`
     """
 
     session_data_filename = 'session.json'
 
     def __init__(self, job_list):
-        # The original list of job that the system knows about.
-        # Not all jobs from this list are going to be executed
-        # (or selected for execution) by the user.
         self._job_list = job_list
-        # State of each job, see JobState for details but it basically
-        # has the test result and the inhibitor of each job. It also serves
-        # as a job.name -> job lookup helper.
-        #
-        # Directly exposed with the intent to fuel part of the UI.
-        #
-        # XXX: this can loose data job_list has jobs with the same name. It
-        # would be better to use job id as the keys here. A separate map could
-        # be used for the name->job lookup.
         self._job_state_map = {job.name: JobState(job)
                                for job in self._job_list}
-        # A subset of job_list that was selected by the user for execution.
-        # Used to compute run_list. Can be changed at will during lifetime
-        # of this object
         self._desired_job_list = []
-        # Copy of desired_job_list that was topologically sorted by the
-        # dependency solver. Jobs must run in this order (although not all jobs
-        # may actually run or will actually be successful)
         self._run_list = []
-        # A collection of known resources. Mapping resource job name to a list
-        # of resource objects. Needed to compute task readiness (as it stores
-        # resource data needed by resource programs). Currently not exposed
-        # outside of this class.
         self._resource_map = {}
         # Temporary directory used as 'scratch space' for running jobs. Removed
         # entirely when session is terminated. Internally this is exposed as
         # $CHECKBOX_DATA to script environment.
         self._session_dir = None
+
         # Directory used to store jobs IO logs.
         self._jobs_io_log_dir = None
 
@@ -355,28 +381,34 @@
         if self._session_dir is None:
             xdg_cache_home = os.environ.get('XDG_CACHE_HOME') or \
                 os.path.join(os.path.expanduser('~'), '.cache')
-            temp_dir = os.path.join(xdg_cache_home, 'plainbox')
-            if not os.path.isdir(temp_dir):
-                os.makedirs(temp_dir)
-            self._session_dir = tempfile.mkdtemp(dir=temp_dir)
+            self._session_dir = os.path.join(xdg_cache_home, 'plainbox')
+            if not os.path.isdir(self._session_dir):
+                os.makedirs(self._session_dir)
         if self._jobs_io_log_dir is None:
             self._jobs_io_log_dir = os.path.join(self._session_dir, 'io-logs')
             if not os.path.isdir(self._jobs_io_log_dir):
                 os.makedirs(self._jobs_io_log_dir)
         return self
 
-    def close(self):
+    def clean(self):
         """
-        Close the session and remove temporary disk state.
-
-        This function removes the directory created by .open() and all the data
-        that was placed there. It is automatically called by __exit__, the
-        context manager exit function. Care should be taken to ensure that all
-        session data, particularly attachments, were saved before.
+        Clean the session directory.
         """
         if self._session_dir is not None:
             shutil.rmtree(self._session_dir)
             self._session_dir = None
+            self._jobs_io_log_dir = None
+            self.open()
+
+    def close(self):
+        """
+        Close the session.
+
+        It is automatically called by __exit__, the context manager exit
+        function.
+        """
+        self._session_dir = None
+        self._jobs_io_log_dir = None
 
     def update_desired_job_list(self, desired_job_list):
         """
@@ -405,7 +437,7 @@
             # resources or runtime complexity.
             try:
                 self._run_list = DependencySolver.resolve_dependencies(
-                    self._job_list, desired_job_list)
+                    self._job_list, self._desired_job_list)
             except DependencyError as exc:
                 # When a dependency error is detected remove the affected job
                 # form _desired_job_list and try again.
@@ -457,11 +489,22 @@
         # Update all job readiness state
         self._recompute_job_readiness()
 
+    def previous_session_file(self):
+        """
+        Check the filesystem for previous session data
+        Returns the full pathname to the session file if it exists
+        """
+        session_filename = os.path.join(self._session_dir,
+                                        self.session_data_filename)
+        if os.path.exists(session_filename):
+            return session_filename
+        else:
+            return None
+
     def persistent_save(self):
         """
         Save to disk the minimum needed to resume plainbox where it stopped
         """
-
         # Ensure an atomic update of the session file:
         #   - create a new temp file (on the same file system!)
         #   - write data to the temp file
@@ -472,7 +515,6 @@
         # directory containing the file has also reached disk.
         # For that an explicit fsync() on a file descriptor for the directory
         # is also needed.
-
         filename = os.path.join(self._session_dir,
                                 self.session_data_filename)
 
@@ -493,6 +535,28 @@
         os.fsync(session_dir_fd)
         os.close(session_dir_fd)
 
+    def resume(self):
+        """
+        Erase the job_state_map and desired_job_list with the saved ones
+        """
+        with open(self.previous_session_file(), 'r') as f:
+            previous_session = json.load(
+                f, object_hook=SessionStateEncoder().dict_to_object)
+        self._job_state_map = previous_session._job_state_map
+        desired_job_list = []
+        for job in previous_session._desired_job_list:
+            if job in self._job_list:
+                desired_job_list.extend(
+                    [j for j in self._job_list if j == job])
+            elif (previous_session._job_state_map[job.name].result.outcome !=
+                    JobResult.OUTCOME_NONE):
+                # Keep jobs results from the previous session without a
+                # definition in the current job_list only if they have
+                # a valid result
+                desired_job_list.append(job)
+        self.update_desired_job_list(desired_job_list)
+        # FIXME: Restore io_logs from files
+
     def _process_resource_result(self, result):
         new_resource_list = []
         for record in self._gen_rfc822_records_from_io_log(result):
@@ -686,7 +750,6 @@
                     job_state.readiness_inhibitor_list.append(inhibitor)
 
     def __enter__(self):
-        self.open()
         return self
 
     def __exit__(self, *args):

=== modified file 'plainbox/plainbox/impl/test_box.py'
--- plainbox/plainbox/impl/test_box.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/test_box.py	2013-03-07 16:10:38 +0000
@@ -24,15 +24,91 @@
 Test definitions for plainbox.impl.box module
 """
 
+import os
+import shutil
+import tempfile
+
+from inspect import cleandoc
+from mock import Mock
 from unittest import TestCase
-from inspect import cleandoc
-
 
 from plainbox import __version__ as version
-from plainbox.impl.box import main
+from plainbox.impl.box import main, CheckBoxCommandMixIn
+from plainbox.impl.mock_job import MockJobDefinition
 from plainbox.testing_utils.io import TestIO
 
 
+class MiscTests(TestCase):
+
+    def setUp(self):
+        self.job_foo = MockJobDefinition(name='foo')
+        self.job_bar = MockJobDefinition(name='bar')
+        self.obj = CheckBoxCommandMixIn(Mock(name="checkbox"))
+
+    def test_matching_job_list(self):
+        # Nothing gets selected automatically
+        ns = Mock()
+        ns.whitelist = None
+        ns.include_pattern_list = []
+        ns.exclude_pattern_list = []
+        observed = self.obj._get_matching_job_list(ns, [
+            self.job_foo, self.job_bar])
+        self.assertEqual(observed, [])
+
+    def test_matching_job_list_including(self):
+        # Including jobs with glob pattern works
+        ns = Mock()
+        ns.whitelist = None
+        ns.include_pattern_list = ['f.+']
+        ns.exclude_pattern_list = []
+        observed = self.obj._get_matching_job_list(ns, [
+            self.job_foo, self.job_bar])
+        self.assertEqual(observed, [self.job_foo])
+
+    def test_matching_job_list_excluding(self):
+        # Excluding jobs with glob pattern works
+        ns = Mock()
+        ns.whitelist = None
+        ns.include_pattern_list = ['.+']
+        ns.exclude_pattern_list = ['f.+']
+        observed = self.obj._get_matching_job_list(ns, [
+            self.job_foo, self.job_bar])
+        self.assertEqual(observed, [self.job_bar])
+
+    def test_matching_job_list_whitelist(self):
+        # whitelists contain list of include patterns
+        # that are read and interpreted as usual
+        whitelist = Mock()
+        whitelist.readlines.return_value = ['foo']
+        ns = Mock()
+        ns.whitelist = whitelist
+        ns.include_pattern_list = []
+        ns.exclude_pattern_list = []
+        observed = self.obj._get_matching_job_list(ns, [
+            self.job_foo, self.job_bar])
+        self.assertEqual(observed, [self.job_foo])
+
+    def test_no_prefix_matching_including(self):
+        # Include patterns should only match whole job name
+        ns = Mock()
+        ns.whitelist = None
+        ns.include_pattern_list = ['fo', 'ba.+']
+        ns.exclude_pattern_list = []
+        observed = self.obj._get_matching_job_list(ns, [self.job_foo,
+                                                        self.job_bar])
+        self.assertEqual(observed, [self.job_bar])
+
+    def test_no_prefix_matching_excluding(self):
+        # Exclude patterns should only match whole job name
+        ns = Mock()
+        ns.whitelist = None
+        ns.include_pattern_list = ['.+']
+        ns.exclude_pattern_list = ['fo', 'ba.+']
+        observed = self.obj._get_matching_job_list(ns, [self.job_foo,
+                                                        self.job_bar])
+        self.assertEqual(observed, [self.job_foo])
+
+
 class TestMain(TestCase):
 
     def test_version(self):
@@ -85,7 +161,7 @@
         self.maxDiff = None
         expected = """
         usage: plainbox special [-h] (-j | -e | -d) [--dot-resources] [-i PATTERN]
-                                [-W WHITELIST]
+                                [-x PATTERN] [-w WHITELIST]
 
         optional arguments:
           -h, --help            show this help message and exit
@@ -97,8 +173,12 @@
 
         job definition options:
           -i PATTERN, --include-pattern PATTERN
-                                Run jobs matching the given pattern
-          -W WHITELIST, --whitelist WHITELIST
+                                Run jobs matching the given regular expression.
+                                Matches from the start to the end of the line.
+          -x PATTERN, --exclude-pattern PATTERN
+                                Do not run jobs matching the given regular expression.
+                                Matches from the start to the end of the line.
+          -w WHITELIST, --whitelist WHITELIST
                                 Load whitelist containing run patterns
         """
         self.assertEqual(io.combined, cleandoc(expected) + "\n")
@@ -110,7 +190,7 @@
             self.assertEqual(call.exception.args, (2,))
         expected = """
         usage: plainbox special [-h] (-j | -e | -d) [--dot-resources] [-i PATTERN]
-                                [-W WHITELIST]
+                                [-x PATTERN] [-w WHITELIST]
         plainbox special: error: one of the arguments -j/--list-jobs -e/--list-expressions -d/--dot is required
         """
         self.assertEqual(io.combined, cleandoc(expected) + "\n")
@@ -130,7 +210,7 @@
     def test_run_list_jobs_with_filtering(self):
         with TestIO() as io:
             with self.assertRaises(SystemExit) as call:
-                main(['special', '--include-pattern=usb3*', '--list-jobs'])
+                main(['special', '--include-pattern=usb3.+', '--list-jobs'])
             self.assertEqual(call.exception.args, (0,))
         # Test that usb3 insertion test was listed but the usb (2.0) test was not
         self.assertIn("usb3/insert", io.stdout.splitlines())
@@ -181,6 +261,14 @@
 
 class TestRun(TestCase):
 
+    def setUp(self):
+        # session data are kept in XDG_CACHE_HOME/plainbox/.session
+        # To avoid resuming a real session, we have to select a temporary
+        # location instead
+        self._sandbox = tempfile.mkdtemp()
+        self._env = os.environ
+        os.environ['XDG_CACHE_HOME'] = self._sandbox
+
     def test_help(self):
         with TestIO(combined=True) as io:
             with self.assertRaises(SystemExit) as call:
@@ -189,7 +277,7 @@
         self.maxDiff = None
         expected = """
         usage: plainbox run [-h] [--not-interactive] [-n] [-f FORMAT] [-p OPTIONS]
-                            [-o FILE] [-i PATTERN] [-W WHITELIST]
+                            [-o FILE] [-i PATTERN] [-x PATTERN] [-w WHITELIST]
 
         optional arguments:
           -h, --help            show this help message and exit
@@ -211,8 +299,12 @@
 
         job definition options:
           -i PATTERN, --include-pattern PATTERN
-                                Run jobs matching the given pattern
-          -W WHITELIST, --whitelist WHITELIST
+                                Run jobs matching the given regular expression.
+                                Matches from the start to the end of the line.
+          -x PATTERN, --exclude-pattern PATTERN
+                                Do not run jobs matching the given regular expression.
+                                Matches from the start to the end of the line.
+          -w WHITELIST, --whitelist WHITELIST
                                 Load whitelist containing run patterns
         """
         self.assertEqual(io.combined, cleandoc(expected) + "\n")
@@ -246,8 +338,12 @@
             self.assertEqual(call.exception.args, (0,))
         expected = """
         Each format may support a different set of options
-        json: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, machine-json
-        rfc822: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs
-        text: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs
+        json: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments, machine-json
+        rfc822: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments
+        text: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, with-attachments
         """
         self.assertEqual(io.combined, cleandoc(expected) + "\n")
+
+    def tearDown(self):
+        shutil.rmtree(self._sandbox)
+        os.environ = self._env

=== modified file 'plainbox/plainbox/impl/test_job.py'
--- plainbox/plainbox/impl/test_job.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/test_job.py	2013-03-07 16:10:38 +0000
@@ -239,8 +239,7 @@
         job_enc = job._get_persistance_subset()
         self.assertEqual(job_enc['data']['plugin'], job.plugin)
         self.assertEqual(job_enc['data']['name'], job.name)
-        with self.assertRaises(KeyError):
-            job_enc['requires']
+        self.assertEqual(job_enc['data']['requires'], job.requires)
         with self.assertRaises(KeyError):
             job_enc['depends']
         with self.assertRaises(KeyError):
@@ -280,7 +279,8 @@
                     "plugin": "user-verify"
                 }
             }"""
-        job_dec = json.loads(raw_json, object_hook=SessionStateEncoder().dict_to_object)
+        job_dec = json.loads(raw_json,
+            object_hook=SessionStateEncoder().dict_to_object)
         self.assertIsInstance(job_dec, JobDefinition)
         self.assertEqual(job_dec.name, "camera/still")
         self.assertEqual(job_dec.plugin, "user-verify")

=== modified file 'plainbox/plainbox/impl/test_result.py'
--- plainbox/plainbox/impl/test_result.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/test_result.py	2013-03-07 16:10:38 +0000
@@ -25,10 +25,11 @@
 """
 import json
 
+from tempfile import TemporaryDirectory
 from unittest import TestCase
 
 from plainbox.impl.result import JobResult
-from plainbox.impl.testing_utils import make_job
+from plainbox.impl.testing_utils import make_io_log, make_job
 from plainbox.impl.session import SessionStateEncoder
 
 
@@ -50,22 +51,24 @@
         self.assertIsNone(result.return_code)
 
     def test_everything(self):
-        result = JobResult({
-            'job': self.job,
-            'outcome': JobResult.OUTCOME_PASS,
-            'comments': "it said blah",
-            'io_log': ((0, 'stdout', b'blah\n'),),
-            'return_code': 0
-        })
-        self.assertEqual(str(result), "A: pass")
-        self.assertEqual(repr(result), (
-            "<JobResult job:<JobDefinition name:'A' plugin:'dummy'>"
-            " outcome:'pass'>"))
-        self.assertIs(result.job, self.job)
-        self.assertEqual(result.outcome, JobResult.OUTCOME_PASS)
-        self.assertEqual(result.comments, "it said blah")
-        self.assertEqual(result.io_log, ((0, 'stdout', b'blah\n'),))
-        self.assertEqual(result.return_code, 0)
+        with TemporaryDirectory() as scratch_dir:
+            result = JobResult({
+                'job': self.job,
+                'outcome': JobResult.OUTCOME_PASS,
+                'comments': "it said blah",
+                'io_log': make_io_log(((0, 'stdout', b'blah\n'),),
+                                      scratch_dir),
+                'return_code': 0
+            })
+            self.assertEqual(str(result), "A: pass")
+            self.assertEqual(repr(result), (
+                "<JobResult job:<JobDefinition name:'A' plugin:'dummy'>"
+                " outcome:'pass'>"))
+            self.assertIs(result.job, self.job)
+            self.assertEqual(result.outcome, JobResult.OUTCOME_PASS)
+            self.assertEqual(result.comments, "it said blah")
+            self.assertEqual(result.io_log, ((0, 'stdout', b'blah\n'),))
+            self.assertEqual(result.return_code, 0)
 
     def test_encode(self):
         result = JobResult({
@@ -99,7 +102,8 @@
                     "return_code": 0
                 }
             }"""
-        result_dec = json.loads(raw_json, object_hook=SessionStateEncoder().dict_to_object)
+        result_dec = json.loads(raw_json,
+            object_hook=SessionStateEncoder().dict_to_object)
         self.assertIsInstance(result_dec, JobResult)
         self.assertEqual(result_dec.job.name, "__audio__")
         self.assertEqual(result_dec.outcome, JobResult.OUTCOME_PASS)

=== modified file 'plainbox/plainbox/impl/test_runner.py'
--- plainbox/plainbox/impl/test_runner.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/test_runner.py	2013-03-07 16:10:38 +0000
@@ -73,11 +73,11 @@
         with TestIO(combined=False) as io:
             obj = FallbackCommandOutputPrinter("example")
             # Whatever gets printed by the job...
-            obj.on_line('stdout', 'line 1\n')
-            obj.on_line('stderr', 'line 1\n')
-            obj.on_line('stdout', 'line 2\n')
-            obj.on_line('stdout', 'line 3\n')
-            obj.on_line('stderr', 'line 2\n')
+            obj.on_line('stdout', b'line 1\n')
+            obj.on_line('stderr', b'line 1\n')
+            obj.on_line('stdout', b'line 2\n')
+            obj.on_line('stdout', b'line 3\n')
+            obj.on_line('stderr', b'line 2\n')
         # Gets printed to stdout _only_, stderr is combined with stdout here
         self.assertEqual(io.stdout, (
             "(job example, <stdout:00001>) line 1\n"

=== modified file 'plainbox/plainbox/impl/test_session.py'
--- plainbox/plainbox/impl/test_session.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/test_session.py	2013-03-07 16:10:38 +0000
@@ -25,18 +25,22 @@
 """
 
 import json
+import os
+import tempfile
+import shutil
 
+from tempfile import TemporaryDirectory
 from unittest import TestCase
 
+from plainbox.impl.depmgr import DependencyMissingError
 from plainbox.impl.resource import Resource
 from plainbox.impl.result import JobResult
 from plainbox.impl.session import JobReadinessInhibitor
 from plainbox.impl.session import JobState
 from plainbox.impl.session import SessionState
+from plainbox.impl.session import SessionStateEncoder
 from plainbox.impl.session import UndesiredJobReadinessInhibitor
-from plainbox.impl.session import SessionStateEncoder
-from plainbox.impl.testing_utils import make_job
-from plainbox.impl.testing_utils import make_job_result
+from plainbox.impl.testing_utils import make_io_log, make_job, make_job_result
 
 
 class JobReadinessInhibitorTests(TestCase):
@@ -236,7 +240,8 @@
                 }
             }
         }"""
-        job_dec = json.loads(raw_json, object_hook=SessionStateEncoder().dict_to_object)
+        job_dec = json.loads(raw_json,
+            object_hook=SessionStateEncoder().dict_to_object)
         self.assertIsInstance(job_dec, JobState)
         self.assertEqual(repr(job_dec._result),
             ("<JobResult job:<JobDefinition name:'X'"
@@ -271,6 +276,23 @@
         self.assertIsNone(self.session_state.session_dir)
 
 
+class RegressionTests(TestCase):
+    # Tests for bugfixes
+
+    def test_crash_in_update_desired_job_list(self):
+        # This checks if a DependencyError can cause crash
+        # update_desired_job_list() with a ValueError, in certain conditions.
+        A = make_job('A', depends='X')
+        L = make_job('L', plugin='local')
+        session = SessionState([A, L])
+        problems = session.update_desired_job_list([A, L])
+        # We should get exactly one DependencyMissingError related to job A and
+        # the undefined job X (that is presumably defined by the local job L)
+        self.assertEqual(len(problems), 1)
+        self.assertIsInstance(problems[0], DependencyMissingError)
+        self.assertIs(problems[0].affected_job, A)
+
+
 class SessionStateSpecialTests(TestCase):
 
     # NOTE: those tests are essential. They allow testing the behavior of
@@ -326,6 +348,7 @@
         self.job_Y = make_job("Y")
         self.job_list = [self.job_A, self.job_R, self.job_X, self.job_Y]
         self.session = SessionState(self.job_list)
+        self.scratch_dir = TemporaryDirectory()
 
     def job_state(self, name):
         # A helper function to avoid overly long expressions
@@ -391,7 +414,8 @@
         # session.
         result_R = JobResult({
             'job': self.job_R,
-            'io_log': ((0, 'stdout', b"attr: value\n"),)
+            'io_log': make_io_log(((0, 'stdout', b"attr: value\n"),),
+                                  self.scratch_dir)
         })
         self.session.update_job_result(self.job_R, result_R)
         # The most obvious thing that can happen, is that the result is simply
@@ -439,12 +463,13 @@
         # another proper record in that order.
         result_R = JobResult({
             'job': self.job_R,
-            'io_log': (
-                (0, 'stdout', b"attr: value-1\n"),
-                (1, 'stdout', b"\n"),
-                (1, 'stdout', b"I-sound-like-a-broken-record\n"),
-                (1, 'stdout', b"\n"),
-                (1, 'stdout', b"attr: value-2\n"))
+            'io_log': make_io_log((
+                    (0, 'stdout', b"attr: value-1\n"),
+                    (1, 'stdout', b"\n"),
+                    (1, 'stdout', b"I-sound-like-a-broken-record\n"),
+                    (1, 'stdout', b"\n"),
+                    (1, 'stdout', b"attr: value-2\n")),
+                self.scratch_dir)
         })
         # Since we cannot control the output of scripts and people indeed make
         # mistakes a warning is issued but no exception is raised to the
@@ -521,7 +546,8 @@
         self.session.update_desired_job_list([self.job_A])
         result_R = JobResult({
             'job': self.job_R,
-            'io_log': ((0, 'stdout', b'attr: wrong value\n'),)
+            'io_log': make_io_log(((0, 'stdout', b'attr: wrong value\n'),),
+                                  self.scratch_dir)
         })
         self.session.update_job_result(self.job_R, result_R)
         # Now A is inhibited by FAILED_RESOURCE
@@ -538,7 +564,8 @@
         # presented to a session that has some resources from that job already.
         result_R_old = JobResult({
             'job': self.job_R,
-            'io_log': ((0, 'stdout', b"attr: old value\n"),)
+            'io_log': make_io_log(((0, 'stdout', b"attr: old value\n"),),
+                                  self.scratch_dir)
         })
         self.session.update_job_result(self.job_R, result_R_old)
         # So here the old result is stored into a new 'R' resource
@@ -547,7 +574,8 @@
         # Now we present the second result for the same job
         result_R_new = JobResult({
             'job': self.job_R,
-            'io_log': ((0, 'stdout', b"attr: new value\n"),)
+            'io_log': make_io_log(((0, 'stdout', b"attr: new value\n"),),
+                                  self.scratch_dir)
         })
         self.session.update_job_result(self.job_R, result_R_new)
         # What should happen here is that the R resource is entirely replaced
@@ -557,3 +585,149 @@
         self.assertEqual(self.session._resource_map, expected_after)
 
     # TODO: add tests for local jobs
+
+    def tearDown(self):
+        self.scratch_dir.cleanup()
+
+
+class SessionStateLocalStorageTests(TestCase):
+
+    def setUp(self):
+        # session data are kept in XDG_CACHE_HOME/plainbox/.session
+        # To avoid resuming a real session, we have to select a temporary
+        # location instead
+        self._sandbox = tempfile.mkdtemp()
+        self._env = os.environ
+        os.environ['XDG_CACHE_HOME'] = self._sandbox
+
+    def job_state(self, name):
+        # A helper function to avoid overly long expressions
+        return self.session.job_state_map[name]
+
+    def test_persistent_save(self):
+        self.job_A = make_job("A")
+        self.job_list = [self.job_A]
+        self.session = SessionState(self.job_list)
+        result_A = JobResult({
+            'job': self.job_A,
+            'outcome': JobResult.OUTCOME_PASS,
+            'comments': 'All good',
+            'return_code': 0,
+            'io_log': ((0, 'stdout', "Success !\n"),)
+        })
+        session_json_text = """{
+            "_job_state_map": {
+                "A": {
+                    "_job": {
+                        "data": {
+                            "name": "A",
+                            "plugin": "dummy",
+                            "requires": null,
+                            "depends": null
+                        },
+                        "_class_id": "JOB_DEFINITION"
+                    },
+                    "_result": {
+                        "data": {
+                            "job": {
+                                "data": {
+                                    "name": "A",
+                                    "plugin": "dummy",
+                                    "requires": null,
+                                    "depends": null
+                                },
+                                "_class_id": "JOB_DEFINITION"
+                            },
+                            "outcome": "pass",
+                            "return_code": 0,
+                            "comments": "All good",
+                            "io_log": [
+                                [
+                                    0,
+                                    "stdout",
+                                    "Success !\\n"
+                                ]
+                            ]
+                        },
+                        "_class_id": "JOB_RESULT"
+                    },
+                    "_class_id": "JOB_STATE"
+                }
+            },
+            "_desired_job_list": [
+                {
+                    "data": {
+                        "name": "A",
+                        "plugin": "dummy",
+                        "requires": null,
+                        "depends": null
+                    },
+                    "_class_id": "JOB_DEFINITION"
+                }
+            ],
+            "_class_id": "SESSION_STATE"
+        }"""
+        self.session.open()
+        self.session.update_desired_job_list([self.job_A])
+        self.session.update_job_result(self.job_A, result_A)
+        self.session.persistent_save()
+        session_file = self.session.previous_session_file()
+        self.session.close()
+        self.assertIsNotNone(session_file)
+        with open(session_file) as f:
+            raw_json = json.load(f)
+            self.maxDiff = None
+            self.assertEqual(raw_json, json.loads(session_json_text))
+
+    def test_resume_session(self):
+        # All of the tests below are using one session. The session has four
+        # jobs, Job A depends on a resource provided by job R which has no
+        # dependencies at all. Both Job X and Y depend on job A.
+        #
+        # A -(resource dependency)-> R
+        #
+        # X -(direct dependency) -> A
+        #
+        # Y -(direct dependency) -> A
+        self.job_A = make_job("A", requires="R.attr == 'value'")
+        self.job_A_expr = self.job_A.get_resource_program().expression_list[0]
+        self.job_R = make_job("R", plugin="resource")
+        self.job_X = make_job("X", depends='A')
+        self.job_Y = make_job("Y", depends='A')
+        self.job_list = [self.job_A, self.job_R, self.job_X, self.job_Y]
+        # Create a new session (session_dir is empty)
+        self.session = SessionState(self.job_list)
+        result_R = JobResult({
+            'job': self.job_R,
+            'io_log': make_io_log(((0, 'stdout', b"attr: value\n"),),
+                                  self._sandbox)
+        })
+        result_A = JobResult({
+            'job': self.job_A,
+            'outcome': JobResult.OUTCOME_PASS
+        })
+        result_X = JobResult({
+            'job': self.job_X,
+            'outcome': JobResult.OUTCOME_PASS
+        })
+        # Job Y can't start as it requires job A
+        self.assertFalse(self.job_state('Y').can_start())
+        self.session.update_desired_job_list([self.job_X, self.job_Y])
+        self.session.open()
+        self.session.update_job_result(self.job_R, result_R)
+        self.session.update_job_result(self.job_A, result_A)
+        self.session.update_job_result(self.job_X, result_X)
+        self.session.persistent_save()
+        self.session.close()
+        # Create a new session (session_dir should contain session data)
+        self.session = SessionState(self.job_list)
+        self.session.open()
+        # Resume the previous session
+        self.session.resume()
+        # This time job Y can start
+        self.assertTrue(self.job_state('Y').can_start())
+        self.session.close()
+
+    def tearDown(self):
+        shutil.rmtree(self._sandbox)
+        os.environ = self._env

=== modified file 'plainbox/plainbox/impl/testing_utils.py'
--- plainbox/plainbox/impl/testing_utils.py	2013-01-30 21:43:05 +0000
+++ plainbox/plainbox/impl/testing_utils.py	2013-03-07 16:10:38 +0000
@@ -18,19 +18,31 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.impl.testing_utils
-===========================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
+:mod:`plainbox.impl.testing_utils` -- plainbox specific test tools
+==================================================================
+
+.. warning::
+
+    THIS MODULE DOES NOT HAVE STABLE PUBLIC API
 """
 
 import inspect
+from tempfile import NamedTemporaryFile
 
 from plainbox.impl.job import JobDefinition
 from plainbox.impl.result import JobResult
 from plainbox.impl.rfc822 import Origin
+from plainbox.impl.runner import io_log_write
+
+
+def make_io_log(io_log, io_log_dir):
+    """
+    Make the io logs serialization to json and return the saved file pathname
+    WARNING: The caller has to remove the file once done with it!
+    """
+    with NamedTemporaryFile(mode='w+t', delete=False) as stream:
+        io_log_write(io_log, stream)
+        return stream.name
 
 
 def make_job(name, plugin="dummy", requires=None, depends=None):

=== removed file 'plainbox/plainbox/impl/utils.py.moved'
--- plainbox/plainbox/impl/utils.py.moved	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/impl/utils.py.moved	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# This file is part of Checkbox.
-#
-# Copyright 2012 Canonical Ltd.
-# Written by:
-#   Zygmunt Krynicki <[e-mail]>
-#
-# Checkbox is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Checkbox is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-plainbox.impl.utils
-===================
-
-Internal implementation of plainbox
-
- * THIS MODULE DOES NOT HAVE STABLE PUBLIC API *
-"""
-
-from io import TextIOWrapper
-from logging import getLogger
-
-from plainbox.impl.job import JobDefinition
-from plainbox.impl.rfc822 import load_rfc822_records
-
-
-logger = getLogger("plainbox.utils")
-
-
-def load(somewhere):
-    if isinstance(somewhere, str):
-        # Load data from a file with the given name
-        filename = somewhere
-        with open(filename, 'rt', encoding='UTF-8') as stream:
-            return load(stream)
-    if isinstance(somewhere, TextIOWrapper):
-        stream = somewhere
-        logger.debug("Loading jobs definitions from %r...", stream.name)
-        record_list = load_rfc822_records(stream)
-        job_list = []
-        for record in record_list:
-            job = JobDefinition.from_rfc822_record(record)
-            logger.debug("Loaded %r", job)
-            job_list.append(job)
-        return job_list
-    else:
-        raise TypeError(
-            "Unsupported type of 'somewhere': {!r}".format(
-                type(somewhere)))

=== modified file 'plainbox/plainbox/public.py'
--- plainbox/plainbox/public.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/public.py	2013-03-07 16:10:38 +0000
@@ -18,8 +18,8 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.public
-===============
+:mod:`plainbox.public` -- public, stable API
+============================================
 
 Public, high-level API for third party developers.
 

=== modified file 'plainbox/plainbox/testing_utils/__init__.py'
--- plainbox/plainbox/testing_utils/__init__.py	2013-01-30 21:43:05 +0000
+++ plainbox/plainbox/testing_utils/__init__.py	2013-03-07 16:10:38 +0000
@@ -18,8 +18,6 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.testing_utils
-======================
-
-Testing utilities for internals of plainbox
+:mod:`plainbox.testing_utils` - generic testing utilities 
+=========================================================
 """

=== modified file 'plainbox/plainbox/testing_utils/cwd.py'
--- plainbox/plainbox/testing_utils/cwd.py	2013-01-30 21:43:05 +0000
+++ plainbox/plainbox/testing_utils/cwd.py	2013-03-07 16:10:38 +0000
@@ -18,8 +18,8 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.testing_utils.cwd
-==========================
+:mod:`plainbox.testing_utils.cwd` -- tools for testing in another directory
+===========================================================================
 
 Implementation of context managers for working in another directory
 """

=== modified file 'plainbox/plainbox/testing_utils/io.py'
--- plainbox/plainbox/testing_utils/io.py	2013-01-30 21:43:05 +0000
+++ plainbox/plainbox/testing_utils/io.py	2013-03-07 16:10:38 +0000
@@ -18,8 +18,8 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.testing_utils.io
-=========================
+:mod:`plainbox.testing_utils.io` -- tools for testing IO
+========================================================
 
 Implementation of context managers for observing IO
 """

=== modified file 'plainbox/plainbox/testing_utils/testcases.py'
--- plainbox/plainbox/testing_utils/testcases.py	2013-01-30 21:43:05 +0000
+++ plainbox/plainbox/testing_utils/testcases.py	2013-03-07 16:10:38 +0000
@@ -18,8 +18,8 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.testing_utils.testcases
-================================
+:mod:`plainbox.testing_utils.testcases` -- additional TestCase classes
+======================================================================
 
 Implementation of additional TestCase classes that aid in testing.
 """
@@ -114,7 +114,7 @@
     parameter values, otherwise this test will behave as if it never existed
     (analogous how multiplication by zero works).
 
-    ..note::
+    .. note::
         Technical note for tinkerers and subclass authors. Python unittest
         framework is pretty annoying to work with or extend. In practice you
         should always keep the source code (of a particular python version)

=== modified file 'plainbox/plainbox/tests.py'
--- plainbox/plainbox/tests.py	2013-02-08 17:02:12 +0000
+++ plainbox/plainbox/tests.py	2013-03-07 16:10:38 +0000
@@ -18,10 +18,8 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-plainbox.tests
-==============
-
-Auxiliary test loader for plainbox
+:mod:`plainbox.tests` -- auxiliary test loaders for plainbox
+============================================================
 """
 
 from unittest.loader import defaultTestLoader

=== modified file 'plainbox/plainbox/vendor/__init__.py'
--- plainbox/plainbox/vendor/__init__.py	2012-11-29 18:59:46 +0000
+++ plainbox/plainbox/vendor/__init__.py	2013-03-07 16:10:38 +0000
@@ -0,0 +1,28 @@
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+:mod:`plainbox.vendor` -- vendorized packages
+=============================================
+
+This module contains external packages that were vendorized (shipped with a
+tree of another project) to simplify dependency management. There is no problem
+with expressing those dependencies at pypi level but it would be annoying to
+have to first package and introduce them to Ubuntu.
+"""

=== modified file 'plainbox/plainbox/vendor/extcmd/__init__.py'
--- plainbox/plainbox/vendor/extcmd/__init__.py	2013-02-22 16:26:25 +0000
+++ plainbox/plainbox/vendor/extcmd/__init__.py	2013-03-07 16:10:38 +0000
@@ -18,8 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-extcmd - subprocess with advanced output processing
-===================================================
+:mod:`plainbox.vendor.extcmd` - subprocess with advanced output processing
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Unlike subprocess, which just gives you a lump of output at the end, extcmd
 allows you to get callbacks (via a delegate class) on all IO.

=== modified file 'plainbox/setup.py'
--- plainbox/setup.py	2013-02-22 16:26:25 +0000
+++ plainbox/setup.py	2013-03-07 16:10:38 +0000
@@ -31,6 +31,9 @@
     author_email="[e-mail]",
     license="GPLv3+",
     description="Simple replacement for checkbox",
+    tests_require=[
+        'mock',
+    ],
     entry_points={
         'console_scripts': [
             'plainbox=plainbox.public:main',

=== modified file 'po/ace.po'
--- po/ace.po	2013-02-22 16:26:25 +0000
+++ po/ace.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/af.po'
--- po/af.po	2013-02-22 16:26:25 +0000
+++ po/af.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/am.po'
--- po/am.po	2013-02-22 16:26:25 +0000
+++ po/am.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/ar.po'
--- po/ar.po	2013-02-22 16:26:25 +0000
+++ po/ar.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1139,7 +1139,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1151,7 +1151,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/ast.po'
--- po/ast.po	2013-02-22 16:26:25 +0000
+++ po/ast.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 "Language: ast\n"
 
 #. Title of the user interface
@@ -1324,7 +1324,7 @@
 msgstr "Axunta'l rexistru de depuración del instalador si existe."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1343,7 +1343,7 @@
 "    ¿Comportóse'l preséu de punteru s'esperaba?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/az.po'
--- po/az.po	2013-02-22 16:26:25 +0000
+++ po/az.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -967,7 +967,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -979,7 +979,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/be.po'
--- po/be.po	2013-02-22 16:26:25 +0000
+++ po/be.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -971,7 +971,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -983,7 +983,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/bg.po'
--- po/bg.po	2013-02-22 16:26:25 +0000
+++ po/bg.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -968,7 +968,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -980,7 +980,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/bn.po'
--- po/bn.po	2013-02-22 16:26:25 +0000
+++ po/bn.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1215,7 +1215,7 @@
 msgstr "ইনস্টলার ডিবাগ লগ বিদ্যমান থাকলে সংযুক্ত করা হয়।"
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1234,7 +1234,7 @@
 "    পয়েন্টকৃত ডিভাইসটি কি প্রত্যাশিত ভাবে কাজ করছে?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/bo.po'
--- po/bo.po	2013-02-22 16:26:25 +0000
+++ po/bo.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:34+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/br.po'
--- po/br.po	2013-02-22 16:26:25 +0000
+++ po/br.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/bs.po'
--- po/bs.po	2013-02-22 16:26:25 +0000
+++ po/bs.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1271,7 +1271,7 @@
 msgstr "Prilaže instalerski debug dnevnik ako postoji."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1290,7 +1290,7 @@
 "    Da li radi pokazivački uređaj kao što je očekivano?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/ca.po'
--- po/ca.po	2013-02-22 16:26:25 +0000
+++ po/ca.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #~ msgid "$output"
 #~ msgstr "$resultat"
@@ -989,7 +989,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1001,7 +1001,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/[e-mail]'
--- po/[e-mail]	2013-02-22 16:26:25 +0000
+++ po/[e-mail]	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:42+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -986,7 +986,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -998,7 +998,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/ckb.po'
--- po/ckb.po	2013-02-22 16:26:25 +0000
+++ po/ckb.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/cs.po'
--- po/cs.po	2013-02-22 16:26:25 +0000
+++ po/cs.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:561
 msgid "_Test"
@@ -1215,7 +1215,7 @@
 msgstr "Existuje-li, připojí ladicí záznam instalátoru"
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1234,7 +1234,7 @@
 "    Fungovalo dotykové zařízení dle očekávání?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/cy.po'
--- po/cy.po	2013-02-22 16:26:25 +0000
+++ po/cy.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:34+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/da.po'
--- po/da.po	2013-02-22 16:26:25 +0000
+++ po/da.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 "X-Poedit-Language: Danish\n"
 
 #. Title of the user interface
@@ -1131,7 +1131,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1143,7 +1143,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/de.po'
--- po/de.po	2013-02-22 16:26:25 +0000
+++ po/de.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:561
 msgid "_Test"
@@ -83,7 +83,7 @@
 
 #: ../gtk/checkbox-gtk.ui.h:5
 msgid "_Skip this test"
-msgstr "Test _überspringen"
+msgstr "_Diesen Test überspringen"
 
 #: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:460
 #: ../checkbox_urwid/urwid_interface.py:289
@@ -1425,7 +1425,7 @@
 "als Anlage bei, falls vorhanden."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1445,7 +1445,7 @@
 "    Arbeitete das Zeigegerät so, wie es vorgesehen ist?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/dv.po'
--- po/dv.po	2013-02-22 16:26:25 +0000
+++ po/dv.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/el.po'
--- po/el.po	2013-02-22 16:26:25 +0000
+++ po/el.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:561
 msgid "_Test"
@@ -1389,7 +1389,7 @@
 msgstr "Επισύναψη της καταγραφής αποσφαλμάτωσης του εγκαταστάτη αν υπάρχει."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1409,7 +1409,7 @@
 "    Λειτούργησε η συσκευή κατάδειξης όπως θα περιμένατε;"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2013-02-22 16:26:25 +0000
+++ po/en_AU.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:34+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1254,7 +1254,7 @@
 msgstr "Attaches the installer debug log if it exists."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1273,7 +1273,7 @@
 "    Did the pointing device work as expected?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/en_CA.po'
--- po/en_CA.po	2013-02-22 16:26:25 +0000
+++ po/en_CA.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:35+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2013-02-22 16:26:25 +0000
+++ po/en_GB.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:34+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #~ msgid "Do you see color bars and static?"
 #~ msgstr "Do you see colour bars and static?"
@@ -1257,7 +1257,7 @@
 msgstr "Attaches the installer debug log if it exists."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1276,7 +1276,7 @@
 "    Did the pointing device work as expected?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/eo.po'
--- po/eo.po	2013-02-22 16:26:25 +0000
+++ po/eo.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #: ../checkbox/application.py:66
 msgid "Usage: checkbox [OPTIONS]"
@@ -1017,7 +1017,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1029,7 +1029,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/es.po'
--- po/es.po	2013-02-22 16:26:25 +0000
+++ po/es.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:34+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:41+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #: ../checkbox/application.py:70
 msgid "Print version information and exit."
@@ -1418,7 +1418,7 @@
 msgstr "Adjunta el registro de depuración del instalador si existe."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1438,7 +1438,7 @@
 "    ¿Se comportó el dispositivo de puntero como se esperaba?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/et.po'
--- po/et.po	2013-02-22 16:26:25 +0000
+++ po/et.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/eu.po'
--- po/eu.po	2013-02-22 16:26:25 +0000
+++ po/eu.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:31+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:38+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/fa.po'
--- po/fa.po	2013-02-22 16:26:25 +0000
+++ po/fa.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:33+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:40+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/fi.po'
--- po/fi.po	2013-02-22 16:26:25 +0000
+++ po/fi.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1240,7 +1240,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1260,7 +1260,7 @@
 "    Toimiko osoitinlaite odotetulla tavalla?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/fr.po'
--- po/fr.po	2013-02-22 16:26:25 +0000
+++ po/fr.po	2013-03-07 16:10:38 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1363,7 +1363,7 @@
 msgstr "Joint le journal de débogage de l'installateur s'il existe."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1383,7 +1383,7 @@
 "    Est-ce que le périphérique de pointage a fonctionné correctement ?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/ga.po'
--- po/ga.po	2013-02-22 16:26:25 +0000
+++ po/ga.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -964,7 +964,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/gd.po'
--- po/gd.po	2013-02-22 16:26:25 +0000
+++ po/gd.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1295,7 +1295,7 @@
 msgstr "A' ceangal log dì-bhugaich an stàlaichear ma tha e ann."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1315,7 +1315,7 @@
 "    An do dh'obraich an innleachd comharraich mar a bha dùil?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/gl.po'
--- po/gl.po	2013-02-22 16:26:25 +0000
+++ po/gl.po	2013-03-07 16:10:38 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1285,7 +1285,7 @@
 msgstr "Anexa o rexistro de depuración do instalador se existe."
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1305,7 +1305,7 @@
 "    Comportouse o dispositivo de punteiro como se agardaba?"
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/he.po'
--- po/he.po	2013-02-22 16:26:25 +0000
+++ po/he.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #: ../gtk/checkbox-gtk.ui.h:4
 msgid "_No"
@@ -1095,7 +1095,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -1107,7 +1107,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:36
+#: ../jobs/input.txt.in:35
 msgid ""
 "PURPOSE:\n"
 "    This test will test your keyboard\n"

=== modified file 'po/hi.po'
--- po/hi.po	2013-02-22 16:26:25 +0000
+++ po/hi.po	2013-03-07 16:10:38 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-15 04:32+0000\n"
-"X-Generator: Launchpad (build 16491)\n"
+"X-Launchpad-Export-Date: 2013-02-23 04:39+0000\n"
+"X-Generator: Launchpad (build 16506)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -966,7 +966,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/input.txt.in:23
+#: ../jobs/input.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will test your pointing device\n"
@@ -978,7 +978,7 @@
 msgstr ""