Merge lp://staging/~didrocks/ubuntu-system-image/small-modifs into lp://staging/~barry/ubuntu-system-image/lp1212781
Proposed by
Didier Roche-Tolomelli
Status: | Merged |
---|---|
Merge reported by: | Barry Warsaw |
Merged at revision: | not available |
Proposed branch: | lp://staging/~didrocks/ubuntu-system-image/small-modifs |
Merge into: | lp://staging/~barry/ubuntu-system-image/lp1212781 |
Diff against target: |
329 lines (+112/-66) 3 files modified
systemimage/bindings.py (+1/-1) systemimage/dbus.py (+22/-4) systemimage/testing/dbus.py (+89/-61) |
To merge this branch: | bzr merge lp://staging/~didrocks/ubuntu-system-image/small-modifs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Barry Warsaw | Approve | ||
Review via email:
|
Description of the change
Misc mock issues fixes
To post a comment you must log in.
Thanks for the fixes and changes!
LP: #1215586 tracks the support for the array-of- dictionaries data type. I'll leave these commented out in my branch for now, so please resolve that issue when the u/i can handle this and I'll re-enable it in the client.
I fixed all the tests.
I had to restore the Reset method; it's used by the test suite due to peculiarities in the way the dbus service is launched through the testing infrastructure.