Checkbox

Merge lp://staging/~roadmr/checkbox/871-create-job-object-wrappers into lp://staging/~brendan-donegan/checkbox/story871_session_restore_dbus

871-create-job-object-wrappers
Merge into story871_session_restore_dbus

Proposed by Daniel Manrique on 2013-08-05

Status:	Merged
Merged at revision:	2287
Proposed branch:	lp://staging/~roadmr/checkbox/871-create-job-object-wrappers
Merge into:	lp://staging/~brendan-donegan/checkbox/story871_session_restore_dbus
Diff against target:	261 lines (+139/-38) 2 files modified plainbox/contrib/dbus-mini-client.py (+119/-37) plainbox/plainbox/impl/service.py (+20/-1)
To merge this branch:	bzr merge lp://staging/~roadmr/checkbox/871-create-job-object-wrappers
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Brendan Donegan		2013-08-05	Pending
Review via email: mp+178487@code.staging.launchpad.net

Description of the change

Merged from trunk to resolve the merge conflict, and added some code to create JobStateWrappers for the restored session's jobs.

This code is still not working (see comments here: https://code.launchpad.net/~brendan-donegan/checkbox/story871_session_restore_dbus/+merge/178284), but should illustrate what needs do be done. The JobStateWrappers *are* created correctly, but they point to JobDefinition copies that aren't known through DBus, and since they're duplicates of existing jobs, I can't simply recreate the JobDefinitionWrappers for them.

I'll set this to "work in progress" to signal that it's not really ready to merge, but you could merge and then revert the last commit to benefit from the "merge from trunk".