Merge lp:~zyga/checkbox/fix-1330359 into lp:checkbox

[Zygmunt Krynicki]

deafbbd providers:checkbox: fix plugin type of _display_after_suspend_
5ab12f3 plainbox:ctrl: reject invalid generated jobs
f4164c1 plainbox:ctrl: use job.id to log problematic jobs
32004ae plainbox:runner: fix JobRunner._run_command when job.command is None

[Sylvain Pineau (sylvain-pineau)]

+1, thanks for the new validation step in that particular case

review: Approve

[Daniel Manrique (roadmr)]

The attempt to merge lp:~zkrynicki/checkbox/fix-1330359 into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.05user 0.02system 0:05.21elapsed 1%CPU (0avgtext+0avgdata 7860maxresident)k
[precise] (timing) 0inputs+32outputs (0major+6069minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 33.28user 10.27system 1:03.99elapsed 68%CPU (0avgtext+0avgdata 50900maxresident)k
[precise] (timing) 0inputs+16248outputs (0major+4242094minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-gui/requirements/container-tests-checkbox-gui-build
[precise-testing] container-tests-checkbox-gui-build: PASS
[precise-testing] (timing) 27.89user 2.20system 0:30.47elapsed 98%CPU (0avgtext+0avgdata 116380maxresident)k
[precise-testing] (timing) 0inputs+4224outputs (0major+478240minor)pagefaults 0swaps
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.64user 0.13system 0:00.81elapsed 96%CPU (0avgtext+0avgdata 39060maxresident)k
[precise-testing] (timing) 0inputs+3152outputs (0major+19737minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 15.42user 0.17system 0:16.25elapsed 95%CPU (0avgtext+0avgdata 86376maxresident)k
[precise-testing] (timing) 0inputs+664outputs (0major+31491minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.18user 0.01system 0:00.21elapsed 92%CPU (0avgtext+0avgdata 10368maxresident)k
[precise-testing] (timing) 0inputs+80outputs (0major+4957minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: FAIL
[precise-testing] stdout: http://paste.ubuntu.com/7663021/
[precise-testing] stderr: http://paste.ubuntu.com/7663022/
[precise-testing] (timing) Command exited with non-zero status 1
[precise-testing] (timing) 4.62user 0.28system 0:04.96elapsed 98%CPU (0avgtext+0avgdata 46216maxresident)k
[precise-testing] (timing) 0inputs+2320outputs (0major+43811minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 23.15user 0.39system 0:23.69elapsed 99%CPU (0avgtext+0avgdata 83492maxresident)k
[precise-testing] (timing) 0inputs+24024outputs (0major+31272minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: PASS
[precise-testing] (timing) 0.56user 0.18system 0:00.79elapsed 93%CPU (0avgtext+0avgdata 27248maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+25490minor)pagefaults 0swaps
Found a test script: ./providers...

[Zygmunt Krynicki (zyga)]

Ohh. I just ran manual tests, I guess that needs more work

On Wed, Jun 18, 2014 at 12:35 PM, Daniel Manrique <
<email address hidden>> wrote:

> The proposal to merge lp:~zkrynicki/checkbox/fix-1330359 into lp:checkbox
> has been updated.
>
> Status: Approved => Needs review
>
> For more details, see:
> https://code.launchpad.net/~zkrynicki/checkbox/fix-1330359/+merge/223521
> --
> https://code.launchpad.net/~zkrynicki/checkbox/fix-1330359/+merge/223521
> You are the owner of lp:~zkrynicki/checkbox/fix-1330359.
>

[Daniel Manrique (roadmr)]

The attempt to merge lp:~zkrynicki/checkbox/fix-1330359 into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.06user 0.01system 0:04.20elapsed 1%CPU (0avgtext+0avgdata 7864maxresident)k
[precise] (timing) 0inputs+32outputs (0major+5772minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 35.03user 11.14system 1:09.04elapsed 66%CPU (0avgtext+0avgdata 51180maxresident)k
[precise] (timing) 0inputs+16264outputs (0major+4237469minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-gui/requirements/container-tests-checkbox-gui-build
[precise-testing] container-tests-checkbox-gui-build: PASS
[precise-testing] (timing) 28.50user 2.07system 0:31.00elapsed 98%CPU (0avgtext+0avgdata 116380maxresident)k
[precise-testing] (timing) 0inputs+4224outputs (0major+478246minor)pagefaults 0swaps
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.55user 0.12system 0:00.73elapsed 91%CPU (0avgtext+0avgdata 38972maxresident)k
[precise-testing] (timing) 0inputs+3152outputs (0major+19545minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 13.33user 0.18system 0:13.57elapsed 99%CPU (0avgtext+0avgdata 82452maxresident)k
[precise-testing] (timing) 0inputs+664outputs (0major+30680minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.13user 0.03system 0:00.17elapsed 91%CPU (0avgtext+0avgdata 10364maxresident)k
[precise-testing] (timing) 0inputs+80outputs (0major+4950minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: FAIL
[precise-testing] stdout: http://paste.ubuntu.com/7742554/
[precise-testing] stderr: http://paste.ubuntu.com/7742555/
[precise-testing] (timing) Command exited with non-zero status 1
[precise-testing] (timing) 4.39user 0.33system 0:04.78elapsed 98%CPU (0avgtext+0avgdata 60712maxresident)k
[precise-testing] (timing) 0inputs+2320outputs (0major+45502minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 19.34user 0.36system 0:19.81elapsed 99%CPU (0avgtext+0avgdata 84200maxresident)k
[precise-testing] (timing) 0inputs+24024outputs (0major+31116minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: PASS
[precise-testing] (timing) 0.53user 0.10system 0:00.68elapsed 93%CPU (0avgtext+0avgdata 23272maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+25479minor)pagefaults 0swaps
Found a test script: ./providers...

[lp:~zyga/checkbox/fix-1330359]

3102. By Jeff Lane  on 2014-07-03

"network script now determines max_speed from ethtool and link_speed from sys/class/net/DEV/speed for more accurate results. [r=roadmr][bug=1336320][author=bladernr]"

3103. By Daniel Manrique on 2014-07-03

"Fixes some problems with the network script (bug 1337537, a small problem with ethtool invocation, some minor string fixes). [r=bladernr][bug=1337537][author=roadmr]"

3104. By Launchpad Translations on behalf of checkbox-dev on 2014-07-04

Launchpad automatic translations update.

3105. By Daniel Manrique on 2014-07-04

"checkbox-support:parsers:udevadm: Refine media card heuristics.

Per https://bugs.launchpad.net/checkbox-support/+bug/1337270, some SSD
hard drives have model names which made our card reader regular
expression mistake them for card readers (specifically the string mSATA
looked like a memory stick to our naive regex). This adds a simple
negative lookahead to ensure MS only matches if it's not followed
immediately by "ata". The regex is case-insensitive. [r=zkrynicki][bug=1337270][author=roadmr]"

3106. By Po-Hsu Lin on 2014-07-04

"automatic merge by tarmac [r=sylvain-pineau][bug=1331302][author=cypressyew]"

3107. By Sylvain Pineau on 2014-07-04

"automatic merge by tarmac [r=roadmr][bug=][author=sylvain-pineau]"

3108. By Sylvain Pineau on 2014-07-07

"automatic merge by tarmac [r=sylvain-pineau][bug=1331302][author=checkbox-dev]"

3109. By Daniel Manrique on 2014-07-09

"Fixes the requirement expression for power-management/tickless_idle. [r=bladernr][bug=1333624][author=roadmr]"

3110. By Chris Gregan on 2014-07-10

"automatic merge by tarmac [r=roadmr][bug=][author=cgregan]"

3111. By Mike Rushton on 2014-07-10

"added ipv6 support via bug 1013273 [r=roadmr][bug=1013273][author=leftyfb]"

3112. By Sylvain Pineau on 2014-07-11

"automatic merge by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

3113. By Jeff Lane  on 2014-07-11

"automatic merge by tarmac [r=roadmr][bug=][author=bladernr]"

3114. By Sylvain Pineau on 2014-07-11

"automatic merge by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

3115. By Launchpad Translations on behalf of checkbox-dev on 2014-07-12

Launchpad automatic translations update.

3116. By Daniel Manrique on 2014-07-14

" checkbox-support:parsers:submission: Be smarter about EFI parsing.

    As seen in
    https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1334131 the
    submission parser blindly invokes the UEFI/BIOS subparser on any
    attachment that contains the string 'UEFI'. This converts the simple "X
    in Y" matching into regular expression matching, then adds a negative
    lookahead to the string for EFI attachments, to ensure we don't parse
    the "uefirtvariable" one by mistake.

    Adding this kind of specificity in the submission parser is somewhat
    kludgy, but the context parser selection is already very hardcoded and
    based on odd heuristics, so in a sense it's consistent.
 [r=zkrynicki][bug=1334131][author=roadmr]"

3117. By Daniel Manrique on 2014-07-14

" providers:checkbox: Fix template and exception handling in xrandr_cycle

    The script now looks for its template file in several locations, is more
    strict with exception handling, and provides better error messages if
    things don't work as expected.

    Due to bin/lib split in plainbox providers, it needs a bit of
    configuration to be run manually (i.e. from outside checkbox or
    plainbox), but the script will provide guidance on the environment
    variable to set for this to work.
 [r=zkrynicki][bug=1329728][author=roadmr]"

3118. By Daniel Manrique on 2014-07-14

"providers:plainbox: better output from gputest-based tests (LP: #1340674)
 [r=roadmr,zkrynicki][bug=1340674][author=roadmr]"

3119. By Sylvain Pineau on 2014-07-14

"automatic merge by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

3120. By Jeff Lane  on 2014-07-14

"automatic merge by tarmac [r=roadmr][bug=1341769][author=bladernr]"

3121. By Sylvain Pineau on 2014-07-15

"automatic merge by tarmac [r=sylvain-pineau][bug=][author=sylvain-pineau]"

3122. By Daniel Manrique on 2014-07-16

"This implements the "unity disable hack" to properly test 3/4-finger tap gestures using Qt/QML.

bad7a00 providers:checkbox: updated multitouch test definitions to use the management script to disable/reenable Unity.
492741d providers:checkbox: Add manage_compiz_plugin script
 [r=zkrynicki][bug=][author=roadmr]"

3123. By Po-Hsu Lin on 2014-07-17

"automatic merge by tarmac [r=roadmr][bug=][author=cypressyew]"

3124. By Daniel Manrique on 2014-07-17

"f2c4dc2 checkbox-support: include and install cputable file
4b788a9 checkbox-support: use io.open in setup.py for compatibility with python 2.7

These allow the tar.gz produced with setup.py sdist for checkbox-support to be used in hexr, in place of checkbox-legacy/old.

 [r=zkrynicki][bug=][author=roadmr]"

3125. By Rod Smith on 2014-07-17

"automatic merge by tarmac [r=zkrynicki][bug=][author=rodsmith]"

3126. By Taihsiang Ho on 2014-07-18

"implement a smarter parser to get pci slot names from DEVPATH (LP: #1334991) [r=zkrynicki][bug=1334991][author=taihsiangho]"

3127. By Sylvain Pineau on 2014-07-19

"Release_2014_Week29 [r=sylvain-pineau][bug=1331302,1341769][author=checkbox-dev]"

3128. By Po-Hsu Lin on 2014-07-21

"automatic merge by tarmac [r=zkrynicki][bug=1346132][author=cypressyew]"

3129. By Launchpad Translations on behalf of checkbox-dev on 2014-07-22

Launchpad automatic translations update.

3130. By Daniel Manrique on 2014-07-22

"providers:checkbox: Change some jobs from user-verify to user-interact-verify [r=apulido][bug=1340621][author=roadmr]"

3131. By Daniel Manrique on 2014-07-22

" providers:checkbox: Revamp of argument handling for network script.

    - Provide clearer message of where to configure settings.
    - Handle "partial" settings (i.e. test won't mysteriously exit if not
      all 4 values are provided, even if for the current test they're not
      all needed)
    - Remove support for the legacy /etc/checkbox.d files.

    https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1342304
    https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1309640
 [r=zkrynicki][bug=1309640,1342304][author=roadmr]"

3132. By Zygmunt Krynicki on 2014-07-22

"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

3133. By Daniel Manrique on 2014-07-22

"providers:checkbox: Add interactive multitouch rotate test.
providers:checkbox: Add interactive multitouch zoom test. [r=zkrynicki,apulido][bug=][author=roadmr]"

3134. By Daniel Manrique on 2014-07-22

"This adds a new test (multitouch-rotate) and 3/4-finger autoverified tap testing to certification.
 [r=apulido][bug=][author=roadmr]"

3135. By Zygmunt Krynicki on 2014-07-22

"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

3136. By Zygmunt Krynicki on 2014-07-23

"automatic merge by tarmac [r=sylvain-pineau][bug=][author=zkrynicki]"

3137. By Zygmunt Krynicki on 2014-07-23

"automatic merge by tarmac [r=sylvain-pineau][bug=][author=zkrynicki]"

3138. By Zygmunt Krynicki on 2014-07-23

"automatic merge by tarmac [r=roadmr][bug=1296424][author=zkrynicki]"

3139. By Daniel Manrique on 2014-07-23

"providers:checkbox: Add the missing hdd_parking script from checkbox-legacy. [r=zkrynicki][bug=1347761][author=roadmr]"

3140. By Daniel Manrique on 2014-07-25

"checkbox-support:xrandr: fix incorrect external function name [r=sylvain-pineau][bug=1348583][author=roadmr]"

3141. By Chris Gregan on 2014-07-25

"automatic merge by tarmac [r=roadmr][bug=][author=cgregan]"

3142. By Daniel Manrique on 2014-07-27

"providers:checkbox: Add a simple screen capture job with matching attachment job.

Job uses gnome-screenshot to capture, then a simple base64 encoding to attach the screenshot.

 [r=zkrynicki][bug=1348539][author=roadmr]"

3143. By Daniel Manrique on 2014-07-28

" providers:checkbox: Added estimated_duration to some tests.

    I also took the opportunity to fix a few minor errors in test
    definitions. Mainly trailing whitespace but also a couple of mistakes in
    the tests themselves.

Tests fixed:
- A couple of user-verify changed to user-verify-interact
- A test for 100 network restarts was doing only 1 iteration.
- A log attachment test depended on its log producer passing, but if the log producer fails, the attacher won't attach the log file (thus no way to debug the problem). [r=zkrynicki][bug=1348289][author=roadmr]"

3144. By Daniel Manrique on 2014-07-28

"providers:checkbox: Fix a couple of jobs with duplicated estimated-duration

These weren't caught by tarmac tests, I need to figure out why, it would have saved one cycle and about 30 minutes of time :/ [r=roadmr][bug=][author=roadmr]"

3145. By Zygmunt Krynicki on 2014-07-28

"automatic merge by tarmac [r=roadmr][bug=1349598][author=zkrynicki]"

3146. By Daniel Manrique on 2014-07-29

"providers:checkbox: Added missing jobs to complete the 30-iteration reboot/poweroff set [r=cgregan][bug=][author=roadmr]"

3147. By Launchpad Translations on behalf of checkbox-dev on 2014-07-30

Launchpad automatic translations update.

[Zygmunt Krynicki (zyga)]

I've fixed the tests. All of the required changes are now added to the first two patches (plainbox:session:resume: update resume examples and plainbox:session:resume: update suspend examples) and one minor change has been rolled into (plainbox:ctrl: use job.id to log problematic jobs)

review: Needs Resubmitting

[lp:~zyga/checkbox/fix-1330359]

3148. By Zygmunt Krynicki on 2014-07-30

plainbox:session:suspend: update suspend examples

This patch updates suspend tests / example jobs to be valid job
definitions. This changes checksums and serialization data but is
otherwise harmless. It is required for the upcoming change that will
reject invalid generated jobs.

Signed-off-by: Zygmunt Krynicki <email address hidden>

3149. By Zygmunt Krynicki on 2014-07-30

plainbox:session:resume: update resume examples

This patch updates resume tests / example jobs to be valid job
definitions. It is required for the upcoming change that will reject
invalid generated jobs (on resume).

Signed-off-by: Zygmunt Krynicki <email address hidden>

3150. By Zygmunt Krynicki on 2014-07-30

plainbox:session:state: update generated job examples

This patch updates one test involving generated jobs handle a valid job
definition. It is required for the upcoming change that will reject
invalid generated jobs.

Signed-off-by: Zygmunt Krynicki <email address hidden>

3151. By Zygmunt Krynicki on 2014-07-30

providers:checkbox: fix plugin type of _display_after_suspend_

This job has no command so instead of plugin: user-interact-verify it
should be defined as plugin: manual

Signed-off-by: Zygmunt Krynicki <email address hidden>

3152. By Zygmunt Krynicki on 2014-07-30

plainbox:runner: fix JobRunner._run_command when job.command is None

When a job definition without a command manages to slip through the
validation subsystem and gets to be executed it would trigger an early
error code path where a DiskJobResult with io_log_filename of () (empty
tuple) to be generated. This would prevent such session from being
resumed later. Since this is an error case that should never happen
let's just raise an exception there instead.

Fixes: https://bugs.launchpad.net/plainbox/+bug/1330359

Signed-off-by: Zygmunt Krynicki <email address hidden>

3153. By Zygmunt Krynicki on 2014-07-30

plainbox:ctrl: reject invalid generated jobs

This patch changes the session state controller to validate all generated
jobs and rejects jobs that don't pass validation. This prevents broken
jobs to be passed to execution where more and more code assumes jobs with
proper data inside.

Signed-off-by: Zygmunt Krynicki <email address hidden>

3154. By Zygmunt Krynicki on 2014-07-30

plainbox:ctrl: use job.id to log problematic jobs

str(job) is a rather verbose, translated string so it may be difficult
to understand in diagnostic output.

Signed-off-by: Zygmunt Krynicki <email address hidden>

=== modified file 'plainbox/plainbox/impl/ctrl.py'
--- plainbox/plainbox/impl/ctrl.py	2014-06-11 16:21:46 +0000
+++ plainbox/plainbox/impl/ctrl.py	2014-07-30 09:39:44 +0000
@@ -59,6 +59,7 @@
 from plainbox.impl.secure.rfc822 import RFC822SyntaxError
 from plainbox.impl.secure.rfc822 import gen_rfc822_records
 from plainbox.impl.session.jobs import JobReadinessInhibitor
+from plainbox.impl.validation import ValidationError
 from plainbox.vendor import extcmd
 
 __all__ = [
@@ -264,7 +265,13 @@
         new_job_list = []
         for record in gen_rfc822_records_from_io_log(job, result):
             new_job = job.create_child_job_from_record(record)
-            new_job_list.append(new_job)
+            try:
+                new_job.validate()
+            except ValidationError as exc:
+                logger.error(_("Ignoring invalid generated job %s: %s"),
+                             new_job.id, exc)
+            else:
+                new_job_list.append(new_job)
         # Then for each new job, add it to the job_list, unless it collides
         # with another job with the same id.
         for new_job in new_job_list:
@@ -315,7 +322,7 @@
             # TRANSLATORS: keep the word "local" untranslated. It is a
             # special type of job that needs to be distinguished.
             _("local script %s returned invalid RFC822 data: %s"),
-            job, exc)
+            job.id, exc)
 
 
 checkbox_session_state_ctrl = CheckBoxSessionStateController()

=== modified file 'plainbox/plainbox/impl/runner.py'
--- plainbox/plainbox/impl/runner.py	2014-05-30 01:01:01 +0000
+++ plainbox/plainbox/impl/runner.py	2014-07-30 09:39:44 +0000
@@ -716,7 +716,7 @@
         """
         # Bail early if there is nothing do do
         if job.command is None:
-            return None, ()
+            raise ValueError(_("job {0} has no command to run").format(job.id))
         # Get an extcmd delegate for observing all the IO the way we need
         delegate, io_log_gen = self._prepare_io_handling(job, config)
         # Create a subprocess.Popen() like object that uses the delegate

=== modified file 'plainbox/plainbox/impl/session/test_resume.py'
--- plainbox/plainbox/impl/session/test_resume.py	2014-04-30 19:23:25 +0000
+++ plainbox/plainbox/impl/session/test_resume.py	2014-07-30 09:39:44 +0000
@@ -205,11 +205,11 @@
                     'e2475434e4c0b2c825541430e526fe0565780dfeb67'
                     '050f3b7f3453aa3cc439b'),
                 'generator': (
-                    'b2aa7b7c4298678cebfdbe30f4aae5be97d320910a5'
-                    'b4dd312606099f35c03b6'),
+                    '7015c949ce3ae91f37e10b304212022fdbc4b10acbc'
+                    'cb78ac58ff10ef7a2c8c8'),
                 'generated': (
-                    '57b395e91bb4af94143eb19586bd18e4013efc5e60d'
-                    '6050d9ec0bea15dd19489'),
+                    '47dd5e318ef99184e4dee8adf818a7f7548978a9470'
+                    '8114c7b3dd2169b9a7a67')
             },
             'results': {
                 '__category__': [{
@@ -217,7 +217,8 @@
                     'execution_duration': None,
                     'io_log': [
                         [0.0, 'stdout', 'cGx1Z2luOmxvY2FsCg=='],
-                        [0.1, 'stdout', 'aWQ6Z2VuZXJhdG9yCg==']],
+                        [0.1, 'stdout', 'aWQ6Z2VuZXJhdG9yCg=='],
+                        [0.2, 'stdout', 'Y29tbWFuZDpmYWtlCg==']],
                     'outcome': None,
                     'return_code': None,
                 }],
@@ -225,7 +226,9 @@
                     'comments': None,
                     'execution_duration': None,
                     'io_log': [
-                        [0.0, 'stdout', 'aWQ6Z2VuZXJhdGVk']],
+                        [0.0, 'stdout', 'aWQ6Z2VuZXJhdGVk'],
+                        [0.1, 'stdout', 'cGx1Z2luOnNoZWxs'],
+                        [0.2, 'stdout', 'Y29tbWFuZDpmYWtl']],
                     'outcome': None,
                     'return_code': None,
                 }],
@@ -272,7 +275,8 @@
         # Create a "generator" job
         self.generator_job = JobDefinition({
             "plugin": "local",
-            "id": "generator"
+            "id": "generator",
+            "command": "fake",
         })
         # Keep a variable for the (future) generated job
         self.generated_job = None
@@ -282,12 +286,17 @@
             "io_log": [
                 (0.0, "stdout", b'plugin:local\n'),
                 (0.1, "stdout", b'id:generator\n'),
+                (0.2, "stdout", b'command:fake\n'),
             ]
         })
         # Create a result for the "generator" job.
         # It will define the "generated" job
         self.generator_result = MemoryJobResult({
-            "io_log": [(0.0, 'stdout', b'id:generated')]
+            "io_log": [
+                (0.0, 'stdout', b'id:generated'),
+                (0.1, 'stdout', b'plugin:shell'),
+                (0.2, 'stdout', b'command:fake'),
+            ]
         })
         self.job_list = [self.category_job, self.generator_job]
         self.suspend_data = gzip.compress(
@@ -1416,10 +1425,9 @@
         """
         verify that _process_job() recreates generated jobs
         """
-        # Set the stage for testing. Setup a session with a known
-        # local job, representation of the job (checksum)
-        # and representation of a single result, which has a single line
-        # that defines a 'id': 'generated' job.
+        # Set the stage for testing. Setup a session with a known local job,
+        # representation of the job (checksum) and representation of a single
+        # result, which has a trivial definition for a 'generated' job.
         job_id = 'local'
         job = make_job(id=job_id, plugin='local')
         jobs_repr = {
@@ -1434,6 +1442,12 @@
                 'io_log': [
                     [0.0, 'stdout', base64.standard_b64encode(
                         b'id: generated'
+                    ).decode('ASCII')],
+                    [0.1, 'stdout', base64.standard_b64encode(
+                        b'plugin: shell'
+                    ).decode('ASCII')],
+                    [0.2, 'stdout', base64.standard_b64encode(
+                        b'command: fake'
                     ).decode('ASCII')]
                 ],
             }]
@@ -1529,7 +1543,7 @@
         # We don't actually introduce it into the resume machinery
         # caveat: make_job() has a default value for
         # plugin='dummy' which we don't want here
-        child = make_job(id='child', plugin=None)
+        child = make_job(id='child', plugin='shell', command='fake')
         session_repr = {
             'jobs': {
                 parent.id: parent.checksum,
@@ -1546,6 +1560,12 @@
                         # to the 'child' job defined above.
                         [0.0, 'stdout', base64.standard_b64encode(
                             b'id: child\n'
+                        ).decode('ASCII')],
+                        [0.1, 'stdout', base64.standard_b64encode(
+                            b'plugin: shell\n'
+                        ).decode('ASCII')],
+                        [0.2, 'stdout', base64.standard_b64encode(
+                            b'command: fake\n'
                         ).decode('ASCII')]
                     ],
                 }],
@@ -1581,10 +1601,11 @@
         parent = make_job(id='c_parent', plugin='local')
         # The child job is only here so that we can get the checksum.
         # We don't actually introduce it into the resume machinery
-        child = make_job(id='b_child', plugin='local')
+        child = make_job(id='b_child', plugin='local', command='fake')
         # caveat: make_job() has a default value for
         # plugin='dummy' which we don't want here
-        grandchild = make_job(id='a_grandchild', plugin=None)
+        grandchild = make_job(id='a_grandchild', plugin='shell',
+                              command='fake')
         session_repr = {
             'jobs': {
                 parent.id: parent.checksum,
@@ -1605,6 +1626,9 @@
                         ).decode('ASCII')],
                         [0.1, 'stdout', base64.standard_b64encode(
                             b'plugin: local\n'
+                        ).decode('ASCII')],
+                        [0.2, 'stdout', base64.standard_b64encode(
+                            b'command: fake\n'
                         ).decode('ASCII')]
 
                     ],
@@ -1619,6 +1643,12 @@
                         # to the 'child' job defined above.
                         [0.0, 'stdout', base64.standard_b64encode(
                             b'id: a_grandchild\n'
+                        ).decode('ASCII')],
+                        [0.1, 'stdout', base64.standard_b64encode(
+                            b'plugin: shell\n'
+                        ).decode('ASCII')],
+                        [0.2, 'stdout', base64.standard_b64encode(
+                            b'command: fake\n'
                         ).decode('ASCII')]
                     ],
                 }],

=== modified file 'plainbox/plainbox/impl/session/test_state.py'
--- plainbox/plainbox/impl/session/test_state.py	2014-03-26 20:01:03 +0000
+++ plainbox/plainbox/impl/session/test_state.py	2014-07-30 09:39:44 +0000
@@ -615,6 +615,7 @@
             'io_log': [
                 (0, 'stdout', b'id: foo\n'),
                 (1, 'stdout', b'plugin: manual\n'),
+                (2, 'stdout', b'description: yada yada\n'),
             ],
         })
         # Show this result to the session

=== modified file 'plainbox/plainbox/impl/session/test_suspend.py'
--- plainbox/plainbox/impl/session/test_suspend.py	2014-03-17 11:15:50 +0000
+++ plainbox/plainbox/impl/session/test_suspend.py	2014-07-30 09:39:44 +0000
@@ -326,7 +326,8 @@
         # Create a "generator" job
         self.generator_job = JobDefinition({
             "plugin": "local",
-            "id": "generator"
+            "id": "generator",
+            "command": "fake",
         })
         # Keep a variable for the (future) generated job
         self.generated_job = None
@@ -336,12 +337,17 @@
             "io_log": [
                 (0.0, "stdout", b'plugin:local\n'),
                 (0.1, "stdout", b'id:generator\n'),
+                (0.2, "stdout", b'command:fake\n'),
             ]
         })
         # Create a result for the "generator" job.
         # It will define the "generated" job
         self.generator_result = MemoryJobResult({
-            "io_log": [(0.0, 'stdout', b'id:generated')]
+            "io_log": [
+                (0.0, 'stdout', b'id:generated'),
+                (0.1, 'stdout', b'plugin:shell'),
+                (0.2, 'stdout', b'command:fake'),
+            ]
         })
         # Create a session that knows about the two jobs that exist
         # directly as files (__category__ and generator)
@@ -405,7 +411,8 @@
                 'return_code': None,
                 'io_log': [
                     [0.0, 'stdout', 'cGx1Z2luOmxvY2FsCg=='],
-                    [0.1, 'stdout', 'aWQ6Z2VuZXJhdG9yCg==']
+                    [0.1, 'stdout', 'aWQ6Z2VuZXJhdG9yCg=='],
+                    [0.2, 'stdout', 'Y29tbWFuZDpmYWtlCg==']
                 ]
             }]
         )
@@ -422,6 +429,8 @@
                 'return_code': None,
                 'io_log': [
                     [0.0, 'stdout', 'aWQ6Z2VuZXJhdGVk'],
+                    [0.1, 'stdout', 'cGx1Z2luOnNoZWxs'],
+                    [0.2, 'stdout', 'Y29tbWFuZDpmYWtl'],
                 ]
             }]
         )
@@ -460,11 +469,11 @@
                     'e2475434e4c0b2c825541430e526fe0565780dfeb67'
                     '050f3b7f3453aa3cc439b'),
                 'generator': (
-                    'b2aa7b7c4298678cebfdbe30f4aae5be97d320910a5'
-                    'b4dd312606099f35c03b6'),
+                    '7015c949ce3ae91f37e10b304212022fdbc4b10acbc'
+                    'cb78ac58ff10ef7a2c8c8'),
                 'generated': (
-                    '57b395e91bb4af94143eb19586bd18e4013efc5e60d'
-                    '6050d9ec0bea15dd19489'),
+                    '47dd5e318ef99184e4dee8adf818a7f7548978a9470'
+                    '8114c7b3dd2169b9a7a67')
             },
             'results': {
                 '__category__': [{
@@ -472,7 +481,8 @@
                     'execution_duration': None,
                     'io_log': [
                         [0.0, 'stdout', 'cGx1Z2luOmxvY2FsCg=='],
-                        [0.1, 'stdout', 'aWQ6Z2VuZXJhdG9yCg==']],
+                        [0.1, 'stdout', 'aWQ6Z2VuZXJhdG9yCg=='],
+                        [0.2, 'stdout', 'Y29tbWFuZDpmYWtlCg==']],
                     'outcome': None,
                     'return_code': None,
                 }],
@@ -480,7 +490,9 @@
                     'comments': None,
                     'execution_duration': None,
                     'io_log': [
-                        [0.0, 'stdout', 'aWQ6Z2VuZXJhdGVk']],
+                        [0.0, 'stdout', 'aWQ6Z2VuZXJhdGVk'],
+                        [0.1, 'stdout', 'cGx1Z2luOnNoZWxs'],
+                        [0.2, 'stdout', 'Y29tbWFuZDpmYWtl']],
                     'outcome': None,
                     'return_code': None,
                 }],

=== modified file 'plainbox/plainbox/impl/test_ctrl.py'
--- plainbox/plainbox/impl/test_ctrl.py	2014-06-11 16:22:07 +0000
+++ plainbox/plainbox/impl/test_ctrl.py	2014-07-30 09:39:44 +0000
@@ -279,7 +279,7 @@
         # Ensure that a warning was logged
         mock_logger.warning.assert_called_once_with(
             "local script %s returned invalid RFC822 data: %s",
-            job, RFC822SyntaxError(
+            job.id, RFC822SyntaxError(
                 None, 1, "Unexpected non-empty line: 'barf\\n'"))
 
     @mock.patch('plainbox.impl.ctrl.gen_rfc822_records_from_io_log')
@@ -457,7 +457,7 @@
         # Ensure that a warning was logged
         mock_logger.warning.assert_called_once_with(
             "local script %s returned invalid RFC822 data: %s",
-            job, RFC822SyntaxError(
+            job.id, RFC822SyntaxError(
                 None, 3, "Unexpected non-empty line: 'error\\n'"))
 
 

=== modified file 'providers/plainbox-provider-checkbox/jobs/suspend.txt.in'
--- providers/plainbox-provider-checkbox/jobs/suspend.txt.in	2014-07-21 15:33:35 +0000
+++ providers/plainbox-provider-checkbox/jobs/suspend.txt.in	2014-07-30 09:39:44 +0000
@@ -465,7 +465,7 @@
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
- plugin: user-interact-verify
+ plugin: manual
  id: suspend/`echo ${index}`_display_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  depends: suspend/suspend_advanced
  _summary: Test display function after suspend for $product